accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1433166 [2/20] - in /accumulo/branches/ACCUMULO-259: ./ assemble/ assemble/platform/ assemble/scripts/ assemble/scripts/init.d/ bin/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ co...
Date Mon, 14 Jan 2013 22:03:34 GMT
Modified: accumulo/branches/ACCUMULO-259/LICENSE
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/LICENSE?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/LICENSE (original)
+++ accumulo/branches/ACCUMULO-259/LICENSE Mon Jan 14 22:03:24 2013
@@ -328,43 +328,6 @@ For the jline library:
     IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
     OF THE POSSIBILITY OF SUCH DAMAGE.
 
-For the kryo and minlog libraries:
-
-    The BSD License
-
-    Copyright (c) 2008, Nathan Sweet
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or 
-    without modification, are permitted provided that the following 
-    conditions are met:
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright 
-    notice, this list of conditions and the following disclaimer 
-    in the documentation and/or other materials provided with 
-    the distribution.
-
-    Neither the name of Esoteric Software nor the names of its 
-    contributors may be used to endorse or promote products derived 
-    from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-    BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-    EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-    AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-    IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-    OF THE POSSIBILITY OF SUCH DAMAGE.
-
 For the protobuf library:
 
     The BSD License
@@ -1006,3 +969,206 @@ For the jersey-server runtime dependency
     state courts of the State of California, with venue lying in Santa Clara
     County, California.
 
+For JCommander:
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2012, Cedric Beust
+
+   Licensed 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.
+

Modified: accumulo/branches/ACCUMULO-259/README
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/README?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/README (original)
+++ accumulo/branches/ACCUMULO-259/README Mon Jan 14 22:03:24 2013
@@ -18,8 +18,14 @@ have maven configured to get Accumulo pr
 the pom.xml file for the necessary components. Activate the 'docs' profile to build
 the Accumulo developer and user manual.
 
-Run "mvn package -P assemble" to build a distribution, or run "mvn package -P assemble,docs"
-to also build the documentation.
+Run "mvn package -P assemble" to build a distribution, or run 
+"mvn package -P assemble,docs" to also build the documentation. By default, 
+Accumulo compiles against Hadoop 1.0.4.  To compile against a different version
+that is compatible with Hadoop 1.0, specify hadoop.version on the command line,
+e.g. "-Dhadoop.version=0.20.205.0" or "-Dhadoop.version=1.1.0".  To compile 
+against Hadoop 2.0, specify "-Dhadoop.profile=2.0".  By default this uses
+2.0.2-alpha.  To compile against a different 2.0-compatible version, specify
+the profile and version, e.g. "-Dhadoop.profile=2.0 -Dhadoop.version=0.23.5".
 
 If you are running on another Unix-like operating system (OSX, etc) then
 you may wish to build the native libraries.  They are not strictly necessary

Propchange: accumulo/branches/ACCUMULO-259/assemble/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 14 22:03:24 2013
@@ -1,5 +1,4 @@
 target
-
 .settings
-
 .project
+accumulo-assemble.iml

Propchange: accumulo/branches/ACCUMULO-259/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/assemble:r1407157,1407301,1417651-1417662,1423032,1423624,1427919,1428054
  Merged /accumulo/trunk/assemble:r1404663-1432174,1432271-1433134
  Merged /accumulo/branches/1.4/assemble:r1407301,1423032,1423629,1427864

Modified: accumulo/branches/ACCUMULO-259/assemble/dist.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/dist.xml?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/assemble/dist.xml (original)
+++ accumulo/branches/ACCUMULO-259/assemble/dist.xml Mon Jan 14 22:03:24 2013
@@ -1,97 +1,97 @@
 <?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. -->
+  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. -->
 <assembly>
-	<id>dist</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<baseDirectory>accumulo-${project.version}</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>../bin</directory>
-			<fileMode>0755</fileMode>
-			<directoryMode>0755</directoryMode>
-		</fileSet>
-		<fileSet>
-			<directory>../logs</directory>
-			<directoryMode>0700</directoryMode>
-			<excludes>
-				<exclude>*</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>../walogs</directory>
-			<directoryMode>0700</directoryMode>
-			<excludes>
-				<exclude>*</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>../</directory>
-			<fileMode>0755</fileMode>
-			<directoryMode>0755</directoryMode>
-			<includes>
-				<include>**/*.py</include>
-				<include>**/*.pl</include>
-				<include>**/*.sh</include>
-				<include>${so}</include>
-			</includes>
-			<excludes>
-				<exclude>**/target</exclude>
-				<exclude>conf/accumulo-env.sh</exclude>
-				<exclude>**/continuous-env.sh</exclude>
-				<exclude>**bin/**</exclude>
-				<exclude>logs/**</exclude>
-				<exclude>walogs/**</exclude>
-				<exclude>**.*</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>../</directory>
-			<excludes>
-				<!-- the following ignored because they were included above -->
-				<exclude>**/*.py</exclude>
-				<exclude>**/*.pl</exclude>
-				<exclude>**/*.sh</exclude>
-				<exclude>walogs/**</exclude>
-				<exclude>logs/**</exclude>
-				<exclude>bin/**</exclude>
+  <id>dist</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <baseDirectory>accumulo-${project.version}</baseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>../bin</directory>
+      <fileMode>0755</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+    <fileSet>
+      <directory>../logs</directory>
+      <directoryMode>0700</directoryMode>
+      <excludes>
+        <exclude>*</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../walogs</directory>
+      <directoryMode>0700</directoryMode>
+      <excludes>
+        <exclude>*</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../</directory>
+      <fileMode>0755</fileMode>
+      <directoryMode>0755</directoryMode>
+      <includes>
+        <include>**/*.py</include>
+        <include>**/*.pl</include>
+        <include>**/*.sh</include>
+        <include>**/*.example</include>
+        <include>${so}</include>
+      </includes>
+      <excludes>
+        <exclude>**/target</exclude>
+        <exclude>conf/accumulo-env.sh</exclude>
+        <exclude>**/continuous-env.sh</exclude>
+        <exclude>**bin/**</exclude>
+        <exclude>logs/**</exclude>
+        <exclude>walogs/**</exclude>
+        <exclude>**.*</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../</directory>
+      <excludes>
+        <!-- the following ignored because they were included above -->
+        <exclude>**/*.py</exclude>
+        <exclude>**/*.pl</exclude>
+        <exclude>**/*.sh</exclude>
+        <exclude>walogs/**</exclude>
+        <exclude>logs/**</exclude>
+        <exclude>bin/**</exclude>
+        <!-- the following directories ignored because they should not be in 
+          the tarball -->
+        <exclude>**/.*/**</exclude>
+        <exclude>**/target/**</exclude>
 
-				<!-- the following directories ignored because they should not be in 
-					the tarball -->
-				<exclude>**/.*/**</exclude>
-				<exclude>**/target/**</exclude>
-
-				<!-- the following files ignored because they should not be in the tarball -->
-				<exclude>**/.*</exclude>
-				<exclude>conf/accumulo-site.xml</exclude>
-				<exclude>conf/accumulo-metrics.xml</exclude>
-				<exclude>**/test-*</exclude>
-				<exclude>conf/slaves</exclude>
-				<exclude>conf/masters</exclude>
-				<exclude>conf/monitor</exclude>
-				<exclude>conf/tracers</exclude>
-				<exclude>conf/gc</exclude>
-				<exclude>**/walkers.txt</exclude>
-				<exclude>**/ingesters.txt</exclude>
-				<exclude>**/*.pyc</exclude>
-				<exclude>**/randomwalk/conf/logger.xml</exclude>
-				<exclude>**/randomwalk/conf/randomwalk.conf</exclude>
-				<exclude>**/randomwalk/conf/walkers</exclude>
-				<exclude>${so}</exclude>
-				<exclude>${jnilib}</exclude>
-			</excludes>
-			<fileMode>0644</fileMode>
-			<directoryMode>0755</directoryMode>
-		</fileSet>
-	</fileSets>
+        <!-- the following files ignored because they should not be in the tarball -->
+        <exclude>**/.*</exclude>
+        <exclude>conf/accumulo-site.xml</exclude>
+        <exclude>conf/accumulo-metrics.xml</exclude>
+        <exclude>**/test-*</exclude>
+        <exclude>conf/slaves</exclude>
+        <exclude>conf/masters</exclude>
+        <exclude>conf/monitor</exclude>
+        <exclude>conf/tracers</exclude>
+        <exclude>conf/gc</exclude>
+        <exclude>**/walkers.txt</exclude>
+        <exclude>**/ingesters.txt</exclude>
+        <exclude>**/*.pyc</exclude>
+        <exclude>**/randomwalk/conf/logger.xml</exclude>
+        <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
+        <exclude>**/randomwalk/conf/walkers</exclude>
+        <exclude>${so}</exclude>
+        <exclude>${jnilib}</exclude>
+      </excludes>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+  </fileSets>
 </assembly>

Modified: accumulo/branches/ACCUMULO-259/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/pom.xml?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/assemble/pom.xml (original)
+++ accumulo/branches/ACCUMULO-259/assemble/pom.xml Mon Jan 14 22:03:24 2013
@@ -260,15 +260,7 @@
                         <type>perm</type>
                         <prefix>/usr/lib/accumulo/lib</prefix>
                       </mapper>
-                      <excludes>**/.svn/**</excludes>
-                    </data>
-                    <data>
-                      <src>${accumulo-top}/NOTICE</src>
-                      <type>file</type>
-                      <mapper>
-                        <type>perm</type>
-                      <prefix>/usr/lib/accumulo</prefix>
-                      </mapper>
+                      <excludes>**/.svn/**,**/lib/native/**</excludes>
                     </data>
                     <data>
                       <src>${accumulo-top}/NOTICE</src>
@@ -322,6 +314,15 @@
                       </mapper>
                       <excludes>**/.svn/**,**/accumulo-site.xml,**/accumulo-env.sh,**/accumulo-metrics.xml,**/test-*,**/slaves,**/masters,**/tracers,**/gc,**/monitor</excludes>
                     </data>
+                    <data>
+                      <src>${accumulo-top}/conf/examples</src>
+                      <type>directory</type>
+                      <mapper>
+                        <type>perm</type>
+                        <prefix>/usr/lib/accumulo/conf/examples</prefix>
+                      </mapper>
+                      <excludes>**/.svn/**</excludes>
+                    </data>
                   </dataSet>
                 </configuration>
               </execution>

Modified: accumulo/branches/ACCUMULO-259/bin/accumulo
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/bin/accumulo?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/bin/accumulo (original)
+++ accumulo/branches/ACCUMULO-259/bin/accumulo Mon Jan 14 22:03:24 2013
@@ -15,15 +15,40 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+_readlink ()
+{
+  result=`readlink -f $1 2>/dev/null`
+  if [ $? -eq 0 ];
+  then
+    echo $result
+    return 0
+  fi
+
+  oldPath=$1
+  if [ -n `echo $oldPath | egrep "^[.]"` ]; then
+    oldPath=`echo $1 | sed -e 's#[.]/##'`
+  fi
+  if [ -z `echo $oldPath | egrep '^/'` ]; then
+    oldPath="`pwd`/$oldPath"
+  fi
+  newPath=$oldPath
+  while [ "$newPath" ];
+  do
+    oldPath=$newPath  
+    newPath=`readlink $newPath`
+  done
+
+  echo $oldPath
+  return 0
+}
 
-bin=`dirname "$0"`
+bin=`_readlink $0`
+bin=`dirname "$bin"`
 bin=`cd "$bin"; pwd`
 
 . "$bin"/config.sh
 
-START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar
-COMMONS_JCI_JARS=$ACCUMULO_HOME/lib/commons-jci-core-1.0.jar:$ACCUMULO_HOME/lib/commons-jci-fam-1.0.jar:$ACCUMULO_HOME/lib/log4j-1.2.16.jar:$ACCUMULO_HOME/lib/commons-logging-1.0.4.jar:$ACCUMULO_HOME/lib/commons-logging-api-1.0.4.jar
-START_CLASSES_DIR=$ACCUMULO_HOME/src/start/target/classes
+START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar:$ACCUMULO_HOME/lib/log4j-1.2.16.jar
 
 locationByProgram() 
 {
@@ -36,6 +61,13 @@ locationByProgram() 
    echo ${RESULT}
 }
 
+test -n "$JAVA_HOME"      || export JAVA_HOME=`locationByProgram java`
+test -n "$HADOOP_HOME"    || export HADOOP_HOME=`locationByProgram hadoop`
+test -n "$ZOOKEEPER_HOME" || export ZOOKEEPER_HOME=`locationByProgram zkCli.sh`
+
+
+DEFAULT_GENERAL_JAVA_OPTS=""
+
 # ACCUMULO_XTRAJARS is where all of the commandline -add items go into for reading by accumulo.
 if [ "$1" = "-add" ] ; then
 	export ACCUMULO_XTRAJARS=$2
@@ -59,19 +91,27 @@ else
 fi
 
 XML_FILES=${ACCUMULO_HOME}/conf
-CLASSPATH=${XML_FILES}:${START_JAR}:${COMMONS_JCI_JARS}
+CLASSPATH=${XML_FILES}:${START_JAR}
 
 if [ -z $JAVA_HOME -o ! -d $JAVA_HOME ]; then
-    echo "JAVA_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
-    exit 1
+  echo "JAVA_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
+  exit 1
 fi
 if [ -z $HADOOP_HOME -o ! -d $HADOOP_HOME ]; then
-    echo "HADOOP_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
-    exit 1
+  echo "HADOOP_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
+  exit 1
 fi
 if [ -z $ZOOKEEPER_HOME -o ! -d $ZOOKEEPER_HOME ]; then
-    echo "ZOOKEEPER_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
-    exit 1
+  echo "ZOOKEEPER_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
+  exit 1
+fi
+if [ -z $ACCUMULO_LOG_DIR ]; then
+  echo "ACCUMULO_LOG_DIR is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
+  exit 1
+fi
+
+if [ ! -d "$ACCUMULO_LOG_DIR" ]; then
+  mkdir -p $ACCUMULO_LOG_DIR;
 fi
 
 #Export the variables just in case they are not exported
@@ -84,4 +124,4 @@ JAVA=$JAVA_HOME/bin/java
 PLATFORM="`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`"
 
 # 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" -classpath $CLASSPATH $ACCUMULO_OPTS -XX:OnOutOfMemoryError="kill -9 %p" -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl -Djava.library.path="$HADOOP_HOME/lib/native/$PLATFORM" -Dorg.apache.accumulo.core.home.dir="$ACCUMULO_HOME" -Dhadoop.home.dir="$HADOOP_HOME" -Dzookeeper.home.dir="$ZOOKEEPER_HOME" org.apache.accumulo.start.Main "$@"
+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_HOME/lib/native/$PLATFORM" -Dorg.apache.accumulo.core.home.dir="$ACCUMULO_HOME" -Dhadoop.home.dir="$HADOOP_HOME" -Dzookeeper.home.dir="$ZOOKEEPER_HOME" org.apache.accumulo.start.Main "$@"

Copied: accumulo/branches/ACCUMULO-259/bin/bootstrap_hdfs.sh (from r1432174, accumulo/trunk/bin/bootstrap_hdfs.sh)
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/bin/bootstrap_hdfs.sh?p2=accumulo/branches/ACCUMULO-259/bin/bootstrap_hdfs.sh&p1=accumulo/trunk/bin/bootstrap_hdfs.sh&r1=1432174&r2=1433166&rev=1433166&view=diff
==============================================================================
--- accumulo/trunk/bin/bootstrap_hdfs.sh (original)
+++ accumulo/branches/ACCUMULO-259/bin/bootstrap_hdfs.sh Mon Jan 14 22:03:24 2013
@@ -24,9 +24,9 @@ bin=`cd "$bin"; pwd`
 #
 # Find the system context directory in HDFS
 #
-SYSTEM_CONTEXT_HDFS_DIR=`grep -A1 "general.vfs.classpaths" $ACCUMULO_HOME/conf/accumulo-site.xml | tail -1 | perl -pe 's/\s+<value>//; s/<\/value>//; print $ARGV[1]'`
+SYSTEM_CONTEXT_HDFS_DIR=`grep -A1 "general.vfs.classpaths" "$ACCUMULO_HOME/conf/accumulo-site.xml" | tail -1 | perl -pe 's/\s+<value>//; s/<\/value>//; print $ARGV[1]'`
 
-if [ -z $SYSTEM_CONTEXT_HDFS_DIR ]; then
+if [ -z "$SYSTEM_CONTEXT_HDFS_DIR" ]; then
 
   echo "Your accumulo-site.xml file is not set up for the HDFS Classloader. Please add the following to your accumulo-site.xml file:"
   echo ""
@@ -41,9 +41,9 @@ fi
 #
 # Create the system context directy in HDFS if it does not exist
 #
-$HADOOP_HOME/bin/hadoop fs -ls $SYSTEM_CONTEXT_HDFS_DIR  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -ls "$SYSTEM_CONTEXT_HDFS_DIR"  > /dev/null
 if [ $? -ne 0 ]; then
-  $HADOOP_HOME/bin/hadoop fs -mkdir $SYSTEM_CONTEXT_HDFS_DIR  > /dev/null
+  "$HADOOP_PREFIX/bin/hadoop" fs -mkdir "$SYSTEM_CONTEXT_HDFS_DIR"  > /dev/null
 fi
 
 #
@@ -61,16 +61,16 @@ fi
 #
 # Copy all jars in lib to the system context directory
 #
-hadoop fs -moveFromLocal $ACCUMULO_HOME/lib/*.jar $SYSTEM_CONTEXT_HDFS_DIR  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -moveFromLocal "$ACCUMULO_HOME/lib/*.jar" "$SYSTEM_CONTEXT_HDFS_DIR"  > /dev/null
 
-$HADOOP_HOME/bin/hadoop fs -setrep -R $REP $SYSTEM_CONTEXT_HDFS_DIR  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -setrep -R $REP "$SYSTEM_CONTEXT_HDFS_DIR"  > /dev/null
 
 #
 # We need two of the jars in lib, copy them back out and remove them from the system context dir
 #
-hadoop fs -copyToLocal $SYSTEM_CONTEXT_HDFS_DIR/log4j-1.2.16.jar $ACCUMULO_HOME/lib/.  > /dev/null
-hadoop fs -rmr $SYSTEM_CONTEXT_HDFS_DIR/log4j-1.2.16.jar  > /dev/null
-hadoop fs -copyToLocal $SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2-2.0.jar $ACCUMULO_HOME/lib/.  > /dev/null
-hadoop fs -rmr $SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2-2.0.jar  > /dev/null
-hadoop fs -copyToLocal $SYSTEM_CONTEXT_HDFS_DIR/accumulo-start-${ACCUMULO_VERSION}.jar $ACCUMULO_HOME/lib/.  > /dev/null
-hadoop fs -rmr $SYSTEM_CONTEXT_HDFS_DIR/accumulo-start-${ACCUMULO_VERSION}.jar  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal "$SYSTEM_CONTEXT_HDFS_DIR/log4j-1.2.16.jar" "$ACCUMULO_HOME/lib/."  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -rmr "$SYSTEM_CONTEXT_HDFS_DIR/log4j-1.2.16.jar"  > /dev/null
+"$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

Modified: accumulo/branches/ACCUMULO-259/bin/config.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/bin/config.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/bin/config.sh (original)
+++ accumulo/branches/ACCUMULO-259/bin/config.sh Mon Jan 14 22:03:24 2013
@@ -49,23 +49,23 @@ if [ -z ${ACCUMULO_VERSION} ]; then
         ACCUMULO_VERSION=1.5.0-SNAPSHOT
 fi
 
-if [ -z "$HADOOP_HOME" ]
+if [ -z "$HADOOP_PREFIX" ]
 then
-   HADOOP_HOME="`which hadoop`"
-   if [ -z "$HADOOP_HOME" ]
+   HADOOP_PREFIX="`which hadoop`"
+   if [ -z "$HADOOP_PREFIX" ]
    then
-      echo "You must set HADOOP_HOME"
+      echo "You must set HADOOP_PREFIX"
       exit 1
    fi
-   HADOOP_HOME=`dirname $HADOOP_HOME`
-   HADOOP_HOME=`dirname $HADOOP_HOME`
+   HADOOP_PREFIX=`dirname $HADOOP_PREFIX`
+   HADOOP_PREFIX=`dirname $HADOOP_PREFIX`
 fi
-if [ ! -d "$HADOOP_HOME" ]
+if [ ! -d "$HADOOP_PREFIX" ]
 then
-    echo "$HADOOP_HOME is not a directory"
+    echo "$HADOOP_PREFIX is not a directory"
     exit 1
 fi
-export HADOOP_HOME
+export HADOOP_PREFIX
 
 if [ ! -f "$ACCUMULO_HOME/conf/masters" -o ! -f "$ACCUMULO_HOME/conf/slaves" ]
 then
@@ -109,3 +109,6 @@ if [ ! -f "$ACCUMULO_HOME/conf/tracers" 
     echo "$MASTER1" > "$ACCUMULO_HOME/conf/tracers"
 fi
 SSH='ssh -qnf -o ConnectTimeout=2'
+
+# See HADOOP-7154 and ACCUMULO-847
+export MALLOC_ARENA_MAX=${MALLOC_ARENA_MAX:-1}

Modified: accumulo/branches/ACCUMULO-259/bin/start-server.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/bin/start-server.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/bin/start-server.sh (original)
+++ accumulo/branches/ACCUMULO-259/bin/start-server.sh Mon Jan 14 22:03:24 2013
@@ -48,7 +48,7 @@ then
   ip=`python -c 'import socket as s; print s.gethostbyname(s.getfqdn())'`
 fi
 
-if [ $HOST == localhost -o $HOST == "`hostname`" -o $HOST == "$ip" ] 
+if [ "$HOST" = "localhost" -o "$HOST" = "`hostname`" -o "$HOST" = "$ip" ] 
 then
   PID=`ps -ef | egrep ${ACCUMULO_HOME}/.*/accumulo.*.jar | grep "Main $SERVICE" | grep -v grep | awk {'print $2'} | head -1`
 else
@@ -57,7 +57,7 @@ fi
 
 if [ -z $PID ]; then
   echo "Starting $LONGNAME on $HOST"
-  if [ $HOST == localhost -o $HOST == "`hostname`" -o $HOST == "$ip" ] 
+  if [ "$HOST" = "localhost" -o "$HOST" = "`hostname`" -o "$HOST" = "$ip" ] 
   then
     ${bin}/accumulo ${SERVICE} --address $1 >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out 2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err & 
     MAX_FILES_OPEN=`bash -c 'ulimit -n'`

Modified: accumulo/branches/ACCUMULO-259/bin/stop-server.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/bin/stop-server.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/bin/stop-server.sh (original)
+++ accumulo/branches/ACCUMULO-259/bin/stop-server.sh Mon Jan 14 22:03:24 2013
@@ -21,14 +21,30 @@ bin=`cd "$bin"; pwd`
 
 . "$bin"/config.sh
 
+HOST=$1
+
+IFCONFIG=/sbin/ifconfig
+if [ ! -x $IFCONFIG ]
+then
+   IFCONFIG='/bin/netstat -ie'
+fi
+ip=`$IFCONFIG 2>/dev/null| grep inet[^6] | awk '{print $2}' | sed 's/addr://' | grep -v 0.0.0.0 | grep -v 127.0.0.1 | head -n 1`
+if [ $? != 0 ]
+then
+  ip=`python -c 'import socket as s; print s.gethostbyname(s.getfqdn())'`
+fi
 
 # only stop if there's not one already running
-if [ "$1" = "`hostname`" ]; then
+if [ "$HOST" = "localhost" -o "$HOST" = "`hostname`" -o "$HOST" = "$ip" ]; then
 	PID=`ps -ef | grep "$ACCUMULO_HOME" | egrep ${2} | grep "Main ${3}" | grep -v grep | grep -v ssh | grep -v stop-server.sh | awk {'print \$2'} | head -1`
+  if [ ! -z $PID ]; then
+    echo "stopping ${3} on $1";
+    kill -s ${4} ${PID} 2>/dev/null
+  fi;
 else
 	PID=`ssh -q -o 'ConnectTimeout 8' $1 "ps -ef | grep \"$ACCUMULO_HOME\" |  egrep '${2}' | grep 'Main ${3}' | grep -v grep | grep -v ssh | grep -v stop-server.sh" | awk {'print $2'} | head -1`
+  if [ ! -z $PID ]; then
+    echo "stopping ${3} on $1";
+    ssh -q -o 'ConnectTimeout 8' $1 "kill -s ${4} ${PID} 2>/dev/null"
+  fi;
 fi
-if [ ! -z $PID ]; then
-        echo "stopping ${3} on $1";
-        ssh -q -o 'ConnectTimeout 8' $1 "kill -s ${4} ${PID} 2>/dev/null"
-fi;

Modified: accumulo/branches/ACCUMULO-259/bin/tool.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/bin/tool.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/bin/tool.sh (original)
+++ accumulo/branches/ACCUMULO-259/bin/tool.sh Mon Jan 14 22:03:24 2013
@@ -20,8 +20,8 @@ bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 . "$bin"/config.sh
 
-if [ -z $HADOOP_HOME ] ; then
-    echo "HADOOP_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
+if [ -z $HADOOP_PREFIX ] ; then
+    echo "HADOOP_PREFIX is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
     exit 1
 fi
 if [ -z $ZOOKEEPER_HOME ] ; then
@@ -36,6 +36,7 @@ CORE_CMD='ls -1 $LIB/accumulo-core-*[^cs
 FATE_CMD='ls -1 $LIB/accumulo-fate-*[^cs].jar'
 THRIFT_CMD='ls -1 $LIB/libthrift-*[^cs].jar'
 CLOUDTRACE_CMD='ls -1 $LIB/cloudtrace-*[^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"
@@ -62,11 +63,17 @@ if [ `eval $CLOUDTRACE_CMD | wc -l` != "
     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`
 CLOUDTRACE_LIB=`eval $CLOUDTRACE_CMD`
+JCOMMANDER_LIB=`eval $JCOMMANDER_CMD`
 
 USERJARS=" "
 for arg in "$@"; do
@@ -87,8 +94,8 @@ for arg in "$@"; do
   fi
 done
 
-LIB_JARS="$THRIFT_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$CLOUDTRACE_LIB"
-H_JARS="$THRIFT_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$CLOUDTRACE_LIB:"
+LIB_JARS="$THRIFT_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$CLOUDTRACE_LIB,$JCOMMANDER_LIB"
+H_JARS="$THRIFT_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$CLOUDTRACE_LIB:$JCOMMANDER_LIB:"
 
 COMMONS_LIBS=`ls -1 $LIB/commons-*.jar`
 for jar in $USERJARS $COMMONS_LIBS; do
@@ -105,5 +112,5 @@ fi
 #echo USERJARS=$USERJARS
 #echo CLASSNAME=$CLASSNAME
 #echo HADOOP_CLASSPATH=$HADOOP_CLASSPATH
-#echo exec "$HADOOP_HOME/bin/hadoop" jar "$TOOLJAR" $CLASSNAME -libjars \"$LIB_JARS\" $ARGS
-exec "$HADOOP_HOME/bin/hadoop" jar "$TOOLJAR" $CLASSNAME -libjars \"$LIB_JARS\" "$@"
+#echo exec "$HADOOP_PREFIX/bin/hadoop" jar "$TOOLJAR" $CLASSNAME -libjars \"$LIB_JARS\" $ARGS
+exec "$HADOOP_PREFIX/bin/hadoop" jar "$TOOLJAR" $CLASSNAME -libjars \"$LIB_JARS\" "$@"

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-env.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-env.sh (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-env.sh Mon Jan 14 22:03:24 2013
@@ -27,9 +27,17 @@
 ### you may want to use smaller values, especially when running everything
 ### on a single machine.
 ###
+if [ -z "$HADOOP_HOME" ]
+then
+   test -z "$HADOOP_PREFIX"      && export HADOOP_PREFIX=/path/to/hadoop
+else
+   HADOOP_PREFIX="$HADOOP_HOME"
+   unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR"       && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+
 
 test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
 test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
 test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
 if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
@@ -40,7 +48,6 @@ test -z "$ACCUMULO_TSERVER_OPTS" && expo
 test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx128m -Xms128m"
 test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx64m -Xms64m" 
 test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="-Xmx64m -Xms64m"
-test -z "$ACCUMULO_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx384m -Xms256m"
 test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75"
 test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m"
-export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/masters ; echo localhost ) 2>/dev/null | head -1`
+export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null | head -1`

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-site.xml?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-site.xml Mon Jan 14 22:03:24 2013
@@ -102,9 +102,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.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.

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/log4j.properties?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/log4j.properties Mon Jan 14 22:03:24 2013
@@ -17,7 +17,6 @@
 #  by default, log everything at INFO or higher to the console
 log4j.rootLogger=INFO,A1
 
-
 # hide Jetty junk
 log4j.logger.org.mortbay.log=WARN,A1
 
@@ -27,6 +26,9 @@ log4j.logger.org.apache.hadoop.io.compre
 # hide junk from TestRandomDeletes
 log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1
 
+# hide junk from VFS
+log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1
+
 # hide almost everything from zookeeper
 log4j.logger.org.apache.zookeeper=ERROR,A1
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-env.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-env.sh (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-env.sh Mon Jan 14 22:03:24 2013
@@ -27,9 +27,17 @@
 ### you may want to use smaller values, especially when running everything
 ### on a single machine.
 ###
+if [ -z "$HADOOP_HOME" ]
+then
+   test -z "$HADOOP_PREFIX"      && export HADOOP_PREFIX=/path/to/hadoop
+else
+   HADOOP_PREFIX="$HADOOP_HOME"
+   unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR"       && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+
 
 test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
 test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
 test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
 if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
@@ -40,7 +48,6 @@ test -z "$ACCUMULO_TSERVER_OPTS" && expo
 test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx128m -Xms128m"
 test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx64m -Xms64m" 
 test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="-Xmx64m -Xms64m"
-test -z "$ACCUMULO_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx384m -Xms256m"
 test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75"
 test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m"
-export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/masters ; echo localhost ) 2>/dev/null | head -1`
+export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null | head -1`

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-site.xml?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-site.xml Mon Jan 14 22:03:24 2013
@@ -97,9 +97,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.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.

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/log4j.properties?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/log4j.properties Mon Jan 14 22:03:24 2013
@@ -17,7 +17,6 @@
 #  by default, log everything at INFO or higher to the console
 log4j.rootLogger=INFO,A1
 
-
 # hide Jetty junk
 log4j.logger.org.mortbay.log=WARN,A1
 
@@ -27,6 +26,9 @@ log4j.logger.org.apache.hadoop.io.compre
 # hide junk from TestRandomDeletes
 log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1
 
+# hide junk from VFS
+log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1
+
 # hide almost everything from zookeeper
 log4j.logger.org.apache.zookeeper=ERROR,A1
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-env.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-env.sh (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-env.sh Mon Jan 14 22:03:24 2013
@@ -27,9 +27,16 @@
 ### you may want to use smaller values, especially when running everything
 ### on a single machine.
 ###
+if [ -z "$HADOOP_HOME" ]
+then
+   test -z "$HADOOP_PREFIX"      && export HADOOP_PREFIX=/path/to/hadoop
+else
+   HADOOP_PREFIX="$HADOOP_HOME"
+   unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR"       && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
 
 test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
 test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
 test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
 if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
@@ -40,7 +47,6 @@ test -z "$ACCUMULO_TSERVER_OPTS" && expo
 test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx256m -Xms256m"
 test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx128m -Xms64m" 
 test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="-Xmx128m -Xms128m"
-test -z "$ACCUMULO_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx768m -Xms256m"
 test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75"
 test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx256m -Xms64m"
-export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/masters ; echo localhost ) 2>/dev/null | head -1`
+export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null | head -1`

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-site.xml?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-site.xml Mon Jan 14 22:03:24 2013
@@ -92,9 +92,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.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.

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/log4j.properties?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/log4j.properties Mon Jan 14 22:03:24 2013
@@ -17,7 +17,6 @@
 #  by default, log everything at INFO or higher to the console
 log4j.rootLogger=INFO,A1
 
-
 # hide Jetty junk
 log4j.logger.org.mortbay.log=WARN,A1
 
@@ -27,6 +26,9 @@ log4j.logger.org.apache.hadoop.io.compre
 # hide junk from TestRandomDeletes
 log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1
 
+# hide junk from VFS
+log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1
+
 # hide almost everything from zookeeper
 log4j.logger.org.apache.zookeeper=ERROR,A1
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-env.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-env.sh (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-env.sh Mon Jan 14 22:03:24 2013
@@ -27,9 +27,17 @@
 ### you may want to use smaller values, especially when running everything
 ### on a single machine.
 ###
+if [ -z "$HADOOP_HOME" ]
+then
+   test -z "$HADOOP_PREFIX"      && export HADOOP_PREFIX=/path/to/hadoop
+else
+   HADOOP_PREFIX="$HADOOP_HOME"
+   unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR"       && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+
 
 test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
 test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
 test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
 if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
@@ -40,7 +48,6 @@ test -z "$ACCUMULO_TSERVER_OPTS" && expo
 test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx256m -Xms256m"
 test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx128m -Xms64m" 
 test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="-Xmx128m -Xms128m"
-test -z "$ACCUMULO_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx768m -Xms256m"
 test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75"
 test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx256m -Xms64m"
-export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/masters ; echo localhost ) 2>/dev/null | head -1`
+export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null | head -1`

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-site.xml?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-site.xml Mon Jan 14 22:03:24 2013
@@ -92,9 +92,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.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.

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/log4j.properties?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/log4j.properties Mon Jan 14 22:03:24 2013
@@ -17,7 +17,6 @@
 #  by default, log everything at INFO or higher to the console
 log4j.rootLogger=INFO,A1
 
-
 # hide Jetty junk
 log4j.logger.org.mortbay.log=WARN,A1
 
@@ -27,6 +26,9 @@ log4j.logger.org.apache.hadoop.io.compre
 # hide junk from TestRandomDeletes
 log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1
 
+# hide junk from VFS
+log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1
+
 # hide almost everything from zookeeper
 log4j.logger.org.apache.zookeeper=ERROR,A1
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-env.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-env.sh (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-env.sh Mon Jan 14 22:03:24 2013
@@ -27,9 +27,16 @@
 ### you may want to use smaller values, especially when running everything
 ### on a single machine.
 ###
+if [ -z "$HADOOP_HOME" ]
+then
+   test -z "$HADOOP_PREFIX"      && export HADOOP_PREFIX=/path/to/hadoop
+else
+   HADOOP_PREFIX="$HADOOP_HOME"
+   unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR"       && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
 
 test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
 test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
 test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
 if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
@@ -40,7 +47,6 @@ test -z "$ACCUMULO_TSERVER_OPTS" && expo
 test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx1g -Xms1g"
 test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx1g -Xms256m" 
 test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="-Xmx256m -Xms256m"
-test -z "$ACCUMULO_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx1g -Xms256m"
 test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75"
 test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx1g -Xms256m"
-export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/masters ; echo localhost ) 2>/dev/null | head -1`
+export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null | head -1`

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-site.xml?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-site.xml Mon Jan 14 22:03:24 2013
@@ -87,9 +87,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.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.

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/log4j.properties?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/log4j.properties Mon Jan 14 22:03:24 2013
@@ -17,7 +17,6 @@
 #  by default, log everything at INFO or higher to the console
 log4j.rootLogger=INFO,A1
 
-
 # hide Jetty junk
 log4j.logger.org.mortbay.log=WARN,A1
 
@@ -27,6 +26,9 @@ log4j.logger.org.apache.hadoop.io.compre
 # hide junk from TestRandomDeletes
 log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1
 
+# hide junk from VFS
+log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1
+
 # hide almost everything from zookeeper
 log4j.logger.org.apache.zookeeper=ERROR,A1
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-env.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-env.sh (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-env.sh Mon Jan 14 22:03:24 2013
@@ -27,9 +27,16 @@
 ### you may want to use smaller values, especially when running everything
 ### on a single machine.
 ###
+if [ -z "$HADOOP_HOME" ]
+then
+   test -z "$HADOOP_PREFIX"      && export HADOOP_PREFIX=/path/to/hadoop
+else
+   HADOOP_PREFIX="$HADOOP_HOME"
+   unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR"       && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
 
 test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
 test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
 test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
 if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
@@ -40,7 +47,6 @@ test -z "$ACCUMULO_TSERVER_OPTS" && expo
 test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx1g -Xms1g"
 test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx1g -Xms256m" 
 test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="-Xmx256m -Xms256m"
-test -z "$ACCUMULO_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx1g -Xms256m"
 test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75"
 test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx1g -Xms256m"
-export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/masters ; echo localhost ) 2>/dev/null | head -1`
+export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null | head -1`

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-site.xml?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-site.xml Mon Jan 14 22:03:24 2013
@@ -87,9 +87,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.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.

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/log4j.properties?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/log4j.properties Mon Jan 14 22:03:24 2013
@@ -17,7 +17,6 @@
 #  by default, log everything at INFO or higher to the console
 log4j.rootLogger=INFO,A1
 
-
 # hide Jetty junk
 log4j.logger.org.mortbay.log=WARN,A1
 
@@ -27,6 +26,9 @@ log4j.logger.org.apache.hadoop.io.compre
 # hide junk from TestRandomDeletes
 log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1
 
+# hide junk from VFS
+log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1
+
 # hide almost everything from zookeeper
 log4j.logger.org.apache.zookeeper=ERROR,A1
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-env.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-env.sh (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-env.sh Mon Jan 14 22:03:24 2013
@@ -27,9 +27,16 @@
 ### you may want to use smaller values, especially when running everything
 ### on a single machine.
 ###
+if [ -z "$HADOOP_HOME" ]
+then
+   test -z "$HADOOP_PREFIX"      && export HADOOP_PREFIX=/path/to/hadoop
+else
+   HADOOP_PREFIX="$HADOOP_HOME"
+   unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR"       && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
 
 test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
 test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
 test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
 if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
@@ -40,7 +47,6 @@ test -z "$ACCUMULO_TSERVER_OPTS" && expo
 test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx128m -Xms128m"
 test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx64m -Xms64m" 
 test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="-Xmx64m -Xms64m"
-test -z "$ACCUMULO_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx128m -Xms128m"
 test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75"
 test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m"
-export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/masters ; echo localhost ) 2>/dev/null | head -1`
+export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null | head -1`

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-site.xml?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-site.xml Mon Jan 14 22:03:24 2013
@@ -97,9 +97,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.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.

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/log4j.properties?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/log4j.properties Mon Jan 14 22:03:24 2013
@@ -17,7 +17,6 @@
 #  by default, log everything at INFO or higher to the console
 log4j.rootLogger=INFO,A1
 
-
 # hide Jetty junk
 log4j.logger.org.mortbay.log=WARN,A1
 
@@ -27,6 +26,9 @@ log4j.logger.org.apache.hadoop.io.compre
 # hide junk from TestRandomDeletes
 log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1
 
+# hide junk from VFS
+log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1
+
 # hide almost everything from zookeeper
 log4j.logger.org.apache.zookeeper=ERROR,A1
 

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-env.sh?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-env.sh (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-env.sh Mon Jan 14 22:03:24 2013
@@ -27,9 +27,16 @@
 ### you may want to use smaller values, especially when running everything
 ### on a single machine.
 ###
+if [ -z "$HADOOP_HOME" ]
+then
+   test -z "$HADOOP_PREFIX"      && export HADOOP_PREFIX=/path/to/hadoop
+else
+   HADOOP_PREFIX="$HADOOP_HOME"
+   unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR"       && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
 
 test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
 test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
 test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
 if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
@@ -40,7 +47,6 @@ test -z "$ACCUMULO_TSERVER_OPTS" && expo
 test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx128m -Xms128m"
 test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx64m -Xms64m" 
 test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="-Xmx64m -Xms64m"
-test -z "$ACCUMULO_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx128m -Xms128m"
 test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75"
 test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m"
-export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/masters ; echo localhost ) 2>/dev/null | head -1`
+export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null | head -1`

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-site.xml?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-site.xml Mon Jan 14 22:03:24 2013
@@ -97,9 +97,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.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.

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/log4j.properties?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/log4j.properties (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/log4j.properties Mon Jan 14 22:03:24 2013
@@ -17,7 +17,6 @@
 #  by default, log everything at INFO or higher to the console
 log4j.rootLogger=INFO,A1
 
-
 # hide Jetty junk
 log4j.logger.org.mortbay.log=WARN,A1
 
@@ -27,6 +26,9 @@ log4j.logger.org.apache.hadoop.io.compre
 # hide junk from TestRandomDeletes
 log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1
 
+# hide junk from VFS
+log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1
+
 # hide almost everything from zookeeper
 log4j.logger.org.apache.zookeeper=ERROR,A1
 

Propchange: accumulo/branches/ACCUMULO-259/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 14 22:03:24 2013
@@ -1,7 +1,5 @@
 target
-
 .settings
-
 .project
-
 .classpath
+accumulo-core.iml

Propchange: accumulo/branches/ACCUMULO-259/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/core:r1404663-1432174,1432271-1433134
  Merged /accumulo/branches/1.4/core:r1407301,1423032,1423629,1427864
  Merged /accumulo/branches/1.4/src/core:r1407157,1423032,1423518,1423624,1427919,1428054

Modified: accumulo/branches/ACCUMULO-259/core/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/pom.xml?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/pom.xml (original)
+++ accumulo/branches/ACCUMULO-259/core/pom.xml Mon Jan 14 22:03:24 2013
@@ -50,7 +50,7 @@
               <goal>exec</goal>
             </goals>
             <configuration>
-              <executable>${basedir}/src/main/thrift/thrift.sh</executable>
+              <executable>${basedir}/src/main/scripts/generate-thrift.sh</executable>
             </configuration>
           </execution>
         </executions>
@@ -73,7 +73,43 @@
       </plugin>
     </plugins>
   </build>
-
+  
+  <profiles>
+    <!-- profile for building against Hadoop 1.0.x
+    Activate by not specifying hadoop.profile -->
+    <profile>
+      <id>hadoop-1.0</id>
+      <activation>
+        <property>
+          <name>!hadoop.profile</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-core</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+    <!-- profile for building against Hadoop 2.0.x
+    Activate using: mvn -Dhadoop.profile=2.0 -->
+    <profile>
+      <id>hadoop-2.0</id>
+      <activation>
+        <property>
+          <name>hadoop.profile</name>
+          <value>2.0</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-client</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
@@ -88,15 +124,11 @@
       <artifactId>cloudtrace</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-core</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
+      <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
     </dependency>
     <dependency>
@@ -131,6 +163,10 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
+    <dependency>
+    	<groupId>com.beust</groupId>
+    	<artifactId>jcommander</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java Mon Jan 14 22:03:24 2013
@@ -217,7 +217,6 @@ public class BloomFilter extends Filter 
       try {
         bits = (BitSet) ois.readObject();
       } catch (ClassNotFoundException e) {
-        // TODO Auto-generated catch block
         e.printStackTrace();
         throw new IOException("BloomFilter tried to deserialize as bitset: " + e);
       }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriter.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriter.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriter.java Mon Jan 14 22:03:24 2013
@@ -20,6 +20,14 @@ import org.apache.accumulo.core.data.Mut
 
 /**
  * Send Mutations to a single Table in Accumulo.
+ * 
+ * When the user uses a Connector to create a BatchWriter,
+ * they specify how much memory and how many threads it should use. 
+ * As the user adds mutations to the batch writer, it buffers them. 
+ * Once the buffered mutations have used half of the user specified buffer, 
+ * the mutations are dumped into the background to be written by a thread pool.
+ * If the user specified memory completely fills up, then writes are held.
+ * When a user calls flush, it does not return until all buffered mutations are written.
  */
 public interface BatchWriter {
   

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java Mon Jan 14 22:03:24 2013
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class BatchWriterConfig {
   private long maxMemory = 50 * 1024 * 1024;
-  private long maxLatency = Long.MAX_VALUE;
+  private long maxLatency = 120000;
   private long timeout = Long.MAX_VALUE;
   private int maxWriteThreads = 3;
   
@@ -42,7 +42,7 @@ public class BatchWriterConfig {
   /**
    * @param maxLatency
    *          The maximum amount of time to hold data in memory before flushing it to servers. For no max set to zero or Long.MAX_VALUE with TimeUnit.MILLIS.
-   *          Defaults to no max.
+   *          Defaults to 120 seconds.
    * @param timeUnit
    *          Determines how maxLatency will be interpreted.
    * @return this to allow chaining of set methods
@@ -52,7 +52,10 @@ public class BatchWriterConfig {
     if (maxLatency < 0)
       throw new IllegalArgumentException("Negative max latency not allowed " + maxLatency);
 
-    this.maxLatency = timeUnit.toMillis(maxLatency);
+    if (maxLatency == 0)
+      this.maxLatency = Long.MAX_VALUE;
+    else
+      this.maxLatency = timeUnit.toMillis(maxLatency);
     return this;
   }
   

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java Mon Jan 14 22:03:24 2013
@@ -188,7 +188,7 @@ public class ClientSideIteratorScanner e
         
         @Override
         public void registerSideChannel(final SortedKeyValueIterator<Key,Value> iter) {}
-      }, false);
+      }, false, null);
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
@@ -207,6 +207,7 @@ public class ClientSideIteratorScanner e
     return new IteratorAdapter(skvi);
   }
   
+  @Deprecated
   @Override
   public void setTimeOut(int timeOut) {
     if (timeOut == Integer.MAX_VALUE)
@@ -215,6 +216,7 @@ public class ClientSideIteratorScanner e
       setTimeout(timeOut, TimeUnit.SECONDS);
   }
   
+  @Deprecated
   @Override
   public int getTimeOut() {
     long timeout = getTimeout(TimeUnit.SECONDS);

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java Mon Jan 14 22:03:24 2013
@@ -48,7 +48,7 @@ public class IsolatedScanner extends Sca
     private ByteSequence lastRow = null;
     private long timeout;
     
-    private Scanner scanner;
+    private final Scanner scanner;
     private ScannerOptions opts;
     private Range range;
     private int batchSize;
@@ -173,6 +173,7 @@ public class IsolatedScanner extends Sca
   public static interface RowBuffer extends Iterable<Entry<Key,Value>> {
     void add(Entry<Key,Value> entry);
     
+    @Override
     Iterator<Entry<Key,Value>> iterator();
     
     void clear();
@@ -229,6 +230,7 @@ public class IsolatedScanner extends Sca
     return new RowBufferingIterator(scanner, this, range, timeOut, batchSize, bufferFactory);
   }
   
+  @Deprecated
   @Override
   public void setTimeOut(int timeOut) {
     if (timeOut == Integer.MAX_VALUE)
@@ -237,6 +239,7 @@ public class IsolatedScanner extends Sca
       setTimeout(timeOut, TimeUnit.SECONDS);
   }
   
+  @Deprecated
   @Override
   public int getTimeOut() {
     long timeout = getTimeout(TimeUnit.SECONDS);

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java Mon Jan 14 22:03:24 2013
@@ -16,12 +16,15 @@
  */
 package org.apache.accumulo.core.client;
 
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.apache.accumulo.core.data.ConstraintViolationSummary;
 import org.apache.accumulo.core.data.KeyExtent;
+import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
 
 /**
  * Communicate the failed mutations of a BatchWriter back to the client.
@@ -31,26 +34,26 @@ public class MutationsRejectedException 
   private static final long serialVersionUID = 1L;
   
   private List<ConstraintViolationSummary> cvsl;
-  private ArrayList<KeyExtent> af;
+  private Map<KeyExtent,Set<SecurityErrorCode>> af;
   private Collection<String> es;
   private int unknownErrors;
   
   /**
    * @param cvsList
    *          list of constraint violations
-   * @param af
+   * @param hashMap
    *          authorization failures
    * @param serverSideErrors
    *          server side errors
    * @param unknownErrors
    *          number of unknown errors
    */
-  public MutationsRejectedException(List<ConstraintViolationSummary> cvsList, ArrayList<KeyExtent> af, Collection<String> serverSideErrors, int unknownErrors,
-      Throwable cause) {
-    super("# constraint violations : " + cvsList.size() + "  # authorization failures : " + af.size() + "  # server errors " + serverSideErrors.size()
+  public MutationsRejectedException(List<ConstraintViolationSummary> cvsList, HashMap<KeyExtent,Set<SecurityErrorCode>> hashMap,
+      Collection<String> serverSideErrors, int unknownErrors, Throwable cause) {
+    super("# constraint violations : " + cvsList.size() + "  security codes: " + hashMap.values() + "  # server errors " + serverSideErrors.size()
         + " # exceptions " + unknownErrors, cause);
     this.cvsl = cvsList;
-    this.af = af;
+    this.af = hashMap;
     this.es = serverSideErrors;
     this.unknownErrors = unknownErrors;
   }
@@ -65,7 +68,7 @@ public class MutationsRejectedException 
   /**
    * @return the internal list of authorization failures
    */
-  public List<KeyExtent> getAuthorizationFailures() {
+  public Map<KeyExtent,Set<SecurityErrorCode>> getAuthorizationFailures() {
     return af;
   }
   

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java?rev=1433166&r1=1433165&r2=1433166&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java Mon Jan 14 22:03:24 2013
@@ -27,6 +27,7 @@ import org.apache.accumulo.core.data.Col
 import org.apache.accumulo.core.data.KeyExtent;
 import org.apache.accumulo.core.data.thrift.IterInfo;
 import org.apache.accumulo.core.data.thrift.TColumn;
+import org.apache.accumulo.core.security.Authorizations;
 
 /**
  * A class that contains information about an ActiveScan
@@ -47,6 +48,7 @@ public class ActiveScan {
   private List<String> ssiList;
   private Map<String,Map<String,String>> ssio;
   private String user;
+  private Authorizations authorizations;
   
   ActiveScan(Instance instance, org.apache.accumulo.core.tabletserver.thrift.ActiveScan activeScan) throws TableNotFoundException {
     this.client = activeScan.client;
@@ -57,6 +59,7 @@ public class ActiveScan {
     this.type = ScanType.valueOf(activeScan.getType().name());
     this.state = ScanState.valueOf(activeScan.state.name());
     this.extent = new KeyExtent(activeScan.extent);
+    this.authorizations = new Authorizations(activeScan.authorizations);
     
     this.columns = new ArrayList<Column>(activeScan.columns.size());
     
@@ -157,4 +160,11 @@ public class ActiveScan {
     return ssio;
   }
   
+  /**
+   * @return the authorizations being used for this scan
+   */
+    
+  public Authorizations getAuthorizations() {
+    return authorizations;
+  }
 }



Mime
View raw message