svn commit: r1438991 - /accumulo/trunk/README

2013-01-26 Thread ctubbsii
Author: ctubbsii
Date: Sat Jan 26 23:27:08 2013
New Revision: 1438991

URL: http://svn.apache.org/viewvc?rev=1438991&view=rev
Log:
ACCUMULO-370 Update README to reflect new tarball name.

Modified:
accumulo/trunk/README

Modified: accumulo/trunk/README
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/README?rev=1438991&r1=1438990&r2=1438991&view=diff
==
--- accumulo/trunk/README (original)
+++ accumulo/trunk/README Sat Jan 26 23:27:08 2013
@@ -44,7 +44,7 @@ easier to install.
 
 Copy the accumulo tar file produced by mvn package from the 
src/assemble/target/
 directory to the desired destination, then untar it (e.g. 
-tar xvzf accumulo-1.5.0-SNAPSHOT-dist.tar.gz).
+tar xzf apache-accumulo-1.5.0-SNAPSHOT-dist.tar.gz).
 
 If you are using the RPM, install the RPM on every machine that will run
 accumulo.




svn commit: r1438989 - in /accumulo/trunk/assemble: dist.xml pom.xml

2013-01-26 Thread ctubbsii
Author: ctubbsii
Date: Sat Jan 26 23:09:57 2013
New Revision: 1438989

URL: http://svn.apache.org/viewvc?rev=1438989&view=rev
Log:
ACCUMULO-370 Added 'apache' branding to the dist tarball and top-level 
directory inside the tarball. Also fixed the formatting of the xml LICENSE 
comment.

Modified:
accumulo/trunk/assemble/dist.xml
accumulo/trunk/assemble/pom.xml

Modified: accumulo/trunk/assemble/dist.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/dist.xml?rev=1438989&r1=1438988&r2=1438989&view=diff
==
--- accumulo/trunk/assemble/dist.xml (original)
+++ accumulo/trunk/assemble/dist.xml Sat Jan 26 23:09:57 2013
@@ -1,20 +1,26 @@
 
-
+
 
   dist
   
 tar.gz
   
-  accumulo-${project.version}
+  apache-accumulo-${project.version}
   
 
   ../bin

Modified: accumulo/trunk/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1438989&r1=1438988&r2=1438989&view=diff
==
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Sat Jan 26 23:09:57 2013
@@ -1,14 +1,20 @@
 
-
+
 http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 
@@ -87,7 +93,7 @@
 
   maven-assembly-plugin
   
-
${project.parent.artifactId}-${project.version}
+
apache-${project.parent.artifactId}-${project.version}
 
   dist.xml
 




svn commit: r1438976 [8/8] - in /accumulo/trunk: ./ assemble/ bin/ contrib/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/ma

2013-01-26 Thread ctubbsii
Added: 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java?rev=1438976&view=auto
==
--- 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java
 (added)
+++ 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java
 Sat Jan 26 22:17:53 2013
@@ -0,0 +1,1013 @@
+/*
+ * 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.
+ */
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.accumulo.trace.thrift;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings("all") public class TestService {
+
+  public interface Iface {
+
+public boolean checkTrace(TInfo tinfo, String message) throws 
org.apache.thrift.TException;
+
+  }
+
+  public interface AsyncIface {
+
+public void checkTrace(TInfo tinfo, String message, 
org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+
+  }
+
+  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
+public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
+  public Factory() {}
+  public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
+return new Client(prot);
+  }
+  public Client getClient(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
+return new Client(iprot, oprot);
+  }
+}
+
+public Client(org.apache.thrift.protocol.TProtocol prot)
+{
+  super(prot, prot);
+}
+
+public Client(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
+  super(iprot, oprot);
+}
+
+public boolean checkTrace(TInfo tinfo, String message) throws 
org.apache.thrift.TException
+{
+  send_checkTrace(tinfo, message);
+  return recv_checkTrace();
+}
+
+public void send_checkTrace(TInfo tinfo, String message) throws 
org.apache.thrift.TException
+{
+  checkTrace_args args = new checkTrace_args();
+  args.setTinfo(tinfo);
+  args.setMessage(message);
+  sendBase("checkTrace", args);
+}
+
+public boolean recv_checkTrace() throws org.apache.thrift.TException
+{
+  checkTrace_result result = new checkTrace_result();
+  receiveBase(result, "checkTrace");
+  if (result.isSetSuccess()) {
+return result.success;
+  }
+  throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "checkTrace failed: unknown result");
+}
+
+  }
+  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient 
implements AsyncIface {
+public static class Factory implements 
org.apache.thrift.async.TAsyncClientFactory {
+  private org.apache.thrift.async.TAsyncClientManager clientManager;
+  private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
+  public Factory(org.apache.thrift.async.TAsyncClientManager 
clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
+this.clientManager = clientManager;
+this.protocolFactory = protocolFactory;
+  }
+  public AsyncClient 
getAsyncClient(org.apache.thrift.transport.T

svn commit: r1438976 [1/8] - in /accumulo/trunk: ./ assemble/ bin/ contrib/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/ma

2013-01-26 Thread ctubbsii
Author: ctubbsii
Date: Sat Jan 26 22:17:53 2013
New Revision: 1438976

URL: http://svn.apache.org/viewvc?rev=1438976&view=rev
Log:
ACCUMULO-618 Update trace to reflect the naming conventions of the rest of the 
project. Also updated instamo and other examples to match the artifact naming 
conventions, and gave the artifacts simple names for display during the project 
build.

Added:
accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/
accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/
  - copied from r1438967, 
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/
accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/

accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java

accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/SpanReceiver.java

accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java

accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/thrift/TestService.java
accumulo/trunk/trace/src/main/thrift/trace.thrift
  - copied, changed from r1438967, 
accumulo/trunk/trace/src/main/thrift/cloudtrace.thrift
accumulo/trunk/trace/src/test/java/org/apache/accumulo/trace/
  - copied from r1438967, 
accumulo/trunk/trace/src/test/java/org/apache/accumulo/cloudtrace/
Removed:
accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/
accumulo/trunk/trace/src/main/thrift/cloudtrace.thrift
accumulo/trunk/trace/src/test/java/org/apache/accumulo/cloudtrace/
Modified:
accumulo/trunk/assemble/pom.xml
accumulo/trunk/bin/tool.sh
accumulo/trunk/contrib/findbugs_build.xml
accumulo/trunk/core/pom.xml

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/SpanTree.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/SpanTreeVisitor.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TraceCommand.java
accumulo/trunk/core/src/main/thrift/client.thrift
accumulo/trunk/core/src/main/thrift/gc.thrift
accumulo/trunk/core/src/main/thrift/master.thrift
accumulo/trunk/core/src/main/thrift/tabletserver.thrift
accumulo/trunk/examples/instamo/pom.xml
accumulo/trunk/examples/pom.xml
accumulo/trunk/examples/simple/pom.xml
accumulo/trunk/fate/pom.xml
accumulo/trunk/pom.xml
accumulo/trunk/proxy/pom.xml
accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh
accumulo/trunk/server/pom.xml

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java

accumulo/trunk/server/src/ma

svn commit: r1438976 [3/8] - in /accumulo/trunk: ./ assemble/ bin/ contrib/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/ma

2013-01-26 Thread ctubbsii
Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java?rev=1438976&r1=1438975&r2=1438976&view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
 Sat Jan 26 22:17:53 2013
@@ -50,13 +50,13 @@ import org.slf4j.LoggerFactory;
 
   public interface Iface {
 
-public GCStatus getStatus(org.apache.accumulo.cloudtrace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials) throws 
org.apache.accumulo.core.security.thrift.ThriftSecurityException, 
org.apache.thrift.TException;
+public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials) throws 
org.apache.accumulo.core.security.thrift.ThriftSecurityException, 
org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-public void getStatus(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials, 
org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials, 
org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
   }
 
@@ -80,13 +80,13 @@ import org.slf4j.LoggerFactory;
   super(iprot, oprot);
 }
 
-public GCStatus getStatus(org.apache.accumulo.cloudtrace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials) throws 
org.apache.accumulo.core.security.thrift.ThriftSecurityException, 
org.apache.thrift.TException
+public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials) throws 
org.apache.accumulo.core.security.thrift.ThriftSecurityException, 
org.apache.thrift.TException
 {
   send_getStatus(tinfo, credentials);
   return recv_getStatus();
 }
 
-public void send_getStatus(org.apache.accumulo.cloudtrace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials) throws org.apache.thrift.TException
+public void send_getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials) throws org.apache.thrift.TException
 {
   getStatus_args args = new getStatus_args();
   args.setTinfo(tinfo);
@@ -125,7 +125,7 @@ import org.slf4j.LoggerFactory;
   super(protocolFactory, clientManager, transport);
 }
 
-public void getStatus(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
+public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
   checkReady();
   getStatus_call method_call = new getStatus_call(tinfo, credentials, 
resultHandler, this, ___protocolFactory, ___transport);
   this.___currentMethod = method_call;
@@ -133,9 +133,9 @@ import org.slf4j.LoggerFactory;
 }
 
 public static class getStatus_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-  private org.apache.accumulo.cloudtrace.thrift.TInfo tinfo;
+  private org.apache.accumulo.trace.thrift.TInfo tinfo;
   private 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper credentials;
-  public getStatus_call(org.apache.accumulo.cloudtrace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials, org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+  public getStatus_call(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.ThriftInstanceTokenWrapper 
credentials, org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org

svn commit: r1438962 [5/5] - in /accumulo/trunk: conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examples/3GB

2013-01-26 Thread ctubbsii
Modified: accumulo/trunk/test/system/test3/bigrow.sh
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/system/test3/bigrow.sh?rev=1438962&r1=1438961&r2=1438962&view=diff
==
--- accumulo/trunk/test/system/test3/bigrow.sh (original)
+++ accumulo/trunk/test/system/test3/bigrow.sh Sat Jan 26 21:04:27 2013
@@ -15,9 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56  
 --rows 1   --start 500 --cols 200;
-../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56  
 --rows 100 --start 0   --cols 1;
-#../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.server.test.VerifyIngest --timestamp 1 --size 50 --random 
56 --rows 1  --start 500 --cols 200;
-../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 
56 --rows 100 --start 0   --cols 1;
-../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56  
 --rows 100 --start 700 --cols 1;
-../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 
56 --rows 100 --start 700 --cols 1;
+../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.test.TestIngest --timestamp 1 --size 50 --random 56   
--rows 1   --start 500 --cols 200;
+../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.test.TestIngest --timestamp 1 --size 50 --random 56   
--rows 100 --start 0   --cols 1;
+#../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.test.VerifyIngest --timestamp 1 --size 50 --random 56 
--rows 1  --start 500 --cols 200;
+../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random 56 
--rows 100 --start 0   --cols 1;
+../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.test.TestIngest --timestamp 1 --size 50 --random 56   
--rows 100 --start 700 --cols 1;
+../../../bin/accumulo jar ../../../lib/accumulo.jar 
org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random 56 
--rows 100 --start 700 --cols 1;

Modified: accumulo/trunk/test/system/test4/README
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/system/test4/README?rev=1438962&r1=1438961&r2=1438962&view=diff
==
--- accumulo/trunk/test/system/test4/README (original)
+++ accumulo/trunk/test/system/test4/README Sat Jan 26 21:04:27 2013
@@ -3,4 +3,4 @@ Test bulk importing data
 Can run this test with pre-existing splits... use the following command to 
create the table with
 100 pre-existing splits 
 
-hadoop jar ../../../lib/accumulo.jar 
'org.apache.accumulo.server.test.TestIngest$CreateTable' 0 500 100
+hadoop jar ../../../lib/accumulo.jar 
'org.apache.accumulo.test.TestIngest$CreateTable' 0 500 100

Modified: accumulo/trunk/test/system/test4/bulk_import_test.sh
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/system/test4/bulk_import_test.sh?rev=1438962&r1=1438961&r2=1438962&view=diff
==
--- accumulo/trunk/test/system/test4/bulk_import_test.sh (original)
+++ accumulo/trunk/test/system/test4/bulk_import_test.sh Sat Jan 26 21:04:27 
2013
@@ -19,26 +19,26 @@ hadoop dfs -rmr /testmf
 
 echo "creating first set of map files"
 
-../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile 
/testmf/mf01 --timestamp 1 --size 50 --random 56 --rows 100 --start 0 
--cols 1 &
-../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile 
/testmf/mf02 --timestamp 1 --size 50 --random 56 --rows 100 --start 100 
--cols 1 &
-../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile 
/testmf/mf03 --timestamp 1 --size 50 --random 56 --rows 100 --start 200 
--cols 1 &
-../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile 
/testmf/mf04 --timestamp 1 --size 50 --random 56 --rows 100 --start 300 
--cols 1 &
-../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile 
/testmf/mf05 --timestamp 1 --size 50 --random 56 --rows 100 --start 400 
--cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest --rfile /testmf/mf01 
--timestamp 1 --size 50 --random 56 --rows 100 --start 0 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest --rfile /testmf/mf02 
--timestamp 1 --size 50 --random 56 --rows 100 --

svn commit: r1438945 - /accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java

2013-01-26 Thread elserj
Author: elserj
Date: Sat Jan 26 18:53:35 2013
New Revision: 1438945

URL: http://svn.apache.org/viewvc?rev=1438945&view=rev
Log:
ACCUMULO-997 Removing logger from Main usage

Modified:
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java

Modified: accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java?rev=1438945&r1=1438944&r2=1438945&view=diff
==
--- accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java 
(original)
+++ accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java Sat 
Jan 26 18:53:35 2013
@@ -113,6 +113,6 @@ public class Main {
   }
   
   private static void printUsage() {
-System.out.println("accumulo init | master | tserver | logger | monitor | 
shell | admin | gc | classpath | rfile-info | tracer | proxy |  
args");
+System.out.println("accumulo init | master | tserver | monitor | shell | 
admin | gc | classpath | rfile-info | tracer | proxy |  args");
   }
 }