accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject 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/main/java/org/apache/accumulo/core/client/impl/ core/s...
Date Sat, 26 Jan 2013 22:17:56 GMT
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/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/TraceRepo.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/TServersServlet.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ListType.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Summary.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/SplitReportMessage.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/TabletStatusMessage.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceFSDataInputStream.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Admin.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
    accumulo/trunk/start/pom.xml
    accumulo/trunk/test/pom.xml
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestIngest.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
    accumulo/trunk/test/system/auto/simple/mapreduce.py
    accumulo/trunk/test/system/bench/lib/Benchmark.py
    accumulo/trunk/trace/pom.xml
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceCallable.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceExecutorService.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceProxy.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/MilliSpan.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/NullSpan.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/impl/RootMilliSpan.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/AsyncSpanReceiver.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/LogSpans.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/SendSpansViaThrift.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/SpanReceiver.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/thrift/TraceWrap.java
    accumulo/trunk/trace/src/main/scripts/generate-thrift.sh
    accumulo/trunk/trace/src/test/java/org/apache/accumulo/trace/instrument/CountSamplerTest.java
    accumulo/trunk/trace/src/test/java/org/apache/accumulo/trace/instrument/PerformanceTest.java
    accumulo/trunk/trace/src/test/java/org/apache/accumulo/trace/instrument/TracerTest.java

Modified: accumulo/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Sat Jan 26 22:17:53 2013
@@ -20,7 +20,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>accumulo-assemble</artifactId>
-  <name>accumulo-assemble</name>
+  <name>Assemble</name>
 
   <packaging>pom</packaging>
 
@@ -41,11 +41,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
-      <artifactId>examples-simple</artifactId>
+      <artifactId>accumulo-examples-simple</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
-      <artifactId>cloudtrace</artifactId>
+      <artifactId>accumulo-trace</artifactId>
     </dependency>
   </dependencies>
 

Modified: accumulo/trunk/bin/tool.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/tool.sh?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/bin/tool.sh (original)
+++ accumulo/trunk/bin/tool.sh Sat Jan 26 22:17:53 2013
@@ -35,7 +35,7 @@ ZOOKEEPER_CMD='ls -1 $ZOOKEEPER_HOME/zoo
 CORE_CMD='ls -1 $LIB/accumulo-core-*[^cs].jar'
 FATE_CMD='ls -1 $LIB/accumulo-fate-*[^cs].jar'
 THRIFT_CMD='ls -1 $LIB/libthrift-*[^cs].jar'
-CLOUDTRACE_CMD='ls -1 $LIB/cloudtrace-*[^cs].jar'
+TRACE_CMD='ls -1 $LIB/accumulo-trace-*[^cs].jar'
 JCOMMANDER_CMD='ls -1 $LIB/jcommander-*[^cs].jar'
 
 if [ `eval $ZOOKEEPER_CMD | wc -l` != "1" ] ; then
@@ -58,8 +58,8 @@ if [ `eval $THRIFT_CMD | wc -l` != "1" ]
     exit 1
 fi
 
-if [ `eval $CLOUDTRACE_CMD | wc -l` != "1" ] ; then
-    echo "Not exactly one cloudtrace jar in $LIB"
+if [ `eval $TRACE_CMD | wc -l` != "1" ] ; then
+    echo "Not exactly one trace jar in $LIB"
     exit 1
 fi
 
@@ -72,7 +72,7 @@ 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`
+TRACE_LIB=`eval $TRACE_CMD`
 JCOMMANDER_LIB=`eval $JCOMMANDER_CMD`
 
 USERJARS=" "
@@ -94,8 +94,8 @@ for arg in "$@"; do
   fi
 done
 
-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:"
+LIB_JARS="$THRIFT_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$TRACE_LIB,$JCOMMANDER_LIB"
+H_JARS="$THRIFT_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$TRACE_LIB:$JCOMMANDER_LIB:"
 
 COMMONS_LIBS=`ls -1 $LIB/commons-*.jar`
 for jar in $USERJARS $COMMONS_LIBS; do

Modified: accumulo/trunk/contrib/findbugs_build.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/contrib/findbugs_build.xml?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/contrib/findbugs_build.xml (original)
+++ accumulo/trunk/contrib/findbugs_build.xml Sat Jan 26 22:17:53 2013
@@ -49,7 +49,7 @@
         <!--pathElement location="${basedir}/../lib/jackson-0.9.2.jar" /-->
         <pathElement location="${basedir}/../lib/accumulo-fate-1.5.0-SNAPSHOT.jar" />
         <pathElement location="${basedir}/../lib/accumulo-start-1.5.0-SNAPSHOT.jar" />
-        <pathElement location="${basedir}/../lib/cloudtrace-1.5.0-SNAPSHOT.jar" />
+        <pathElement location="${basedir}/../lib/accumulo-trace-1.5.0-SNAPSHOT.jar" />
       </auxClasspath>
       <sourcePath>
         <pathElement location="${basedir}/core/src/main/java" />
@@ -72,7 +72,7 @@
       <class location="${basedir}/../lib/accumulo-server-1.5.0-SNAPSHOT.jar" />
       <class location="${basedir}/../lib/accumulo-start-1.5.0-SNAPSHOT.jar" />
       <class location="${basedir}/../lib/accumulo-test-1.5.0-SNAPSHOT.jar" />
-      <class location="${basedir}/../lib/cloudtrace-1.5.0-SNAPSHOT.jar" />
+      <class location="${basedir}/../lib/accumulo-trace-1.5.0-SNAPSHOT.jar" />
       <class location="${basedir}/../lib/examples-simple-1.5.0-SNAPSHOT.jar" />
     </findbugs>
   </target>

Modified: accumulo/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/pom.xml?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/core/pom.xml (original)
+++ accumulo/trunk/core/pom.xml Sat Jan 26 22:17:53 2013
@@ -25,7 +25,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>accumulo-core</artifactId>
-  <name>accumulo-core</name>
+  <name>Core</name>
 
   <build>
     <pluginManagement>
@@ -129,7 +129,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
-      <artifactId>cloudtrace</artifactId>
+      <artifactId>accumulo-trace</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java Sat Jan
26 22:17:53 2013
@@ -21,7 +21,7 @@ import java.util.Map.Entry;
 import java.util.TreeMap;
 import java.util.UUID;
 
-import org.apache.accumulo.cloudtrace.instrument.Trace;
+import org.apache.accumulo.trace.instrument.Trace;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
Sat Jan 26 22:17:53 2013
@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.accumulo.cloudtrace.instrument.Tracer;
+import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
Sat Jan 26 22:17:53 2013
@@ -18,7 +18,7 @@ package org.apache.accumulo.core.client.
 
 import java.util.Set;
 
-import org.apache.accumulo.cloudtrace.instrument.Tracer;
+import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Instance;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
Sat Jan 26 22:17:53 2013
@@ -42,7 +42,7 @@ import java.util.concurrent.atomic.Atomi
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import org.apache.accumulo.cloudtrace.instrument.Tracer;
+import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
Sat Jan 26 22:17:53 2013
@@ -18,7 +18,7 @@ package org.apache.accumulo.core.client.
 
 import java.util.concurrent.TimeUnit;
 
-import org.apache.accumulo.cloudtrace.instrument.Tracer;
+import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchDeleter;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
Sat Jan 26 22:17:53 2013
@@ -34,8 +34,8 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.accumulo.cloudtrace.instrument.TraceRunnable;
-import org.apache.accumulo.cloudtrace.instrument.Tracer;
+import org.apache.accumulo.trace.instrument.TraceRunnable;
+import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
Sat Jan 26 22:17:53 2013
@@ -35,10 +35,10 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.accumulo.cloudtrace.instrument.Span;
-import org.apache.accumulo.cloudtrace.instrument.Trace;
-import org.apache.accumulo.cloudtrace.instrument.Tracer;
-import org.apache.accumulo.cloudtrace.thrift.TInfo;
+import org.apache.accumulo.trace.instrument.Span;
+import org.apache.accumulo.trace.instrument.Trace;
+import org.apache.accumulo.trace.instrument.Tracer;
+import org.apache.accumulo.trace.thrift.TInfo;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
Sat Jan 26 22:17:53 2013
@@ -27,10 +27,10 @@ import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
 
-import org.apache.accumulo.cloudtrace.instrument.Span;
-import org.apache.accumulo.cloudtrace.instrument.Trace;
-import org.apache.accumulo.cloudtrace.instrument.Tracer;
-import org.apache.accumulo.cloudtrace.thrift.TInfo;
+import org.apache.accumulo.trace.instrument.Span;
+import org.apache.accumulo.trace.instrument.Trace;
+import org.apache.accumulo.trace.instrument.Tracer;
+import org.apache.accumulo.trace.thrift.TInfo;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Instance;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java?rev=1438976&r1=1438975&r2=1438976&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java Sat
Jan 26 22:17:53 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.core.client.impl;
 
-import org.apache.accumulo.cloudtrace.instrument.Tracer;
+import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Instance;



Mime
View raw message