accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject svn commit: r1479020 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ proxy/src/main/java/org/apache/accumulo/proxy/ proxy/src/test/java/org/ap...
Date Sat, 04 May 2013 00:56:01 GMT
Author: ctubbsii
Date: Sat May  4 00:56:00 2013
New Revision: 1479020

URL: http://svn.apache.org/r1479020
Log:
ACCUMULO-1316, ACCUMULO-14 merge to trunk

Added:
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/
      - copied from r1479000, accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/mini/
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloCluster.java
      - copied unchanged from r1479000, accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloCluster.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloConfig.java
      - copied unchanged from r1479000, accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloConfig.java
    accumulo/trunk/server/src/test/java/org/apache/accumulo/server/mini/
      - copied from r1479000, accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/mini/
    accumulo/trunk/server/src/test/java/org/apache/accumulo/server/mini/MiniAccumuloClusterTest.java
      - copied unchanged from r1479000, accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/mini/MiniAccumuloClusterTest.java
    accumulo/trunk/server/src/test/resources/FooFilter.jar
      - copied unchanged from r1479000, accumulo/branches/1.5/server/src/test/resources/FooFilter.jar
Removed:
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/
    accumulo/trunk/server/src/test/java/org/apache/accumulo/server/test/
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java
Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/assemble/pom.xml
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/pom.xml   (contents, props changed)
    accumulo/trunk/proxy/pom.xml
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
    accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/server/pom.xml
    accumulo/trunk/server/src/test/resources/log4j.properties
    accumulo/trunk/src/   (props changed)
    accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1478902-1479000

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1478902-1479000

Modified: accumulo/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1479020&r1=1479019&r2=1479020&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Sat May  4 00:56:00 2013
@@ -110,7 +110,7 @@
             <artifactId>maven-assembly-plugin</artifactId>
             <executions>
               <execution>
-                <id>distro-assembly</id>
+                <id>binary-assembly</id>
                 <goals>
                   <goal>single</goal>
                 </goals>
@@ -145,124 +145,170 @@
               <keyPassphrase>
                 <passphrase>dummy</passphrase>
               </keyPassphrase>
-              <classifier>bin</classifier>
               <summary>Apache Accumulo BigTable clone</summary>
               <description>Apache Accumulo is a large distributed structured store
based on Google's BigTable design.</description>
               <!-- This populates the license field of the RPM. -->
               <copyright>Apache License, Version 2.0 and others (see included LICENSE
file)</copyright>
               <url>http://accumulo.apache.org</url>
               <group>Utilities</group>
-              <requires>
-                <require>jdk</require>
-                <require>hadoop</require>
-                <require>zookeeper</require>
-              </requires>
               <prefix>/opt/accumulo</prefix>
               <defaultDirmode>755</defaultDirmode>
               <defaultFilemode>644</defaultFilemode>
               <defaultUsername>root</defaultUsername>
               <defaultGroupname>root</defaultGroupname>
-              <mappings>
-                <mapping>
-                  <directory>/opt/accumulo/accumulo-${project.version}</directory>
-                  <sources>
-                    <source>
-                      <location>${accumulo-top}/LICENSE</location>
-                    </source>
-                    <source>
-                      <location>${accumulo-top}/NOTICE</location>
-                    </source>
-                    <source>
-                      <location>${accumulo-top}/README</location>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
-                  <sources>
-                    <source>
-                      <location>${accumulo-top}/docs</location>
-                      <excludes>
-                        <exclude>src/**</exclude>
-                      </excludes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
-                  <sources>
-                    <source>
-                      <location>${accumulo-top}/test</location>
-                      <excludes>
-                        <exclude>src/**</exclude>
-                        <exclude>target/**</exclude>
-                        <exclude>**/walkers.txt</exclude>
-                        <exclude>**/ingesters.txt</exclude>
-                        <exclude>**/continuous-env.sh</exclude>
-                        <exclude>.*/**</exclude>
-                        <exclude>**/*.pyc</exclude>
-                        <exclude>**/*.pyo</exclude>
-                        <exclude>pom.xml</exclude>
-                      </excludes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
-                </mapping>
-                <mapping>
-                  <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
-                  <directoryIncluded>false</directoryIncluded>
-                  <filemode>755</filemode>
-                  <username>root</username>
-                  <groupname>root</groupname>
-                  <sources>
-                    <source>
-                      <location>${accumulo-top}/bin</location>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
-                  <sources>
-                    <source>
-                      <location>${accumulo-top}/conf</location>
-                      <excludes>
-                        <exclude>${accumulo-top}/**/accumulo-site.xml</exclude>
-                        <exclude>${accumulo-top}/**/accumulo-env.sh</exclude>
-                        <exclude>${accumulo-top}/**/accumulo-metrics.xml</exclude>
-                        <exclude>${accumulo-top}/**/test-*</exclude>
-                        <exclude>${accumulo-top}/**/slaves</exclude>
-                        <exclude>${accumulo-top}/**/masters</exclude>
-                        <exclude>${accumulo-top}/**/tracers</exclude>
-                        <exclude>${accumulo-top}/**/gc</exclude>
-                        <exclude>${accumulo-top}/**/monitor</exclude>
-                      </excludes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
-                  <sources>
-                    <source>
-                      <location>${accumulo-top}/lib</location>
-                      <includes>
-                        <include>*.jar</include>
-                      </includes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/opt/accumulo/accumulo-${project.version}/lib/ext</directory>
-                </mapping>
-              </mappings>
             </configuration>
             <executions>
               <execution>
+                <id>build-bin-rpm</id>
                 <goals>
                   <goal>attached-rpm</goal>
                 </goals>
                 <phase>package</phase>
+                <configuration>
+                  <name>accumulo</name>
+                  <classifier>bin</classifier>
+                  <provides>
+                    <provide>accumulo</provide>
+                    <provide>accumulo-core</provide>
+                    <provide>accumulo-examples</provide>
+                    <provide>accumulo-fate</provide>
+                    <provide>accumulo-proxy</provide>
+                    <provide>accumulo-server</provide>
+                    <provide>accumulo-start</provide>
+                    <provide>accumulo-test</provide>
+                    <provide>accumulo-trace</provide>
+                  </provides>
+                  <requires>
+                    <require>jdk</require>
+                    <require>hadoop</require>
+                    <require>zookeeper</require>
+                  </requires>
+                  <mappings>
+                    <mapping>
+                      <directory>/opt/accumulo/accumulo-${project.version}</directory>
+                      <sources>
+                        <source>
+                          <location>${accumulo-top}/LICENSE</location>
+                        </source>
+                        <source>
+                          <location>${accumulo-top}/NOTICE</location>
+                        </source>
+                        <source>
+                          <location>${accumulo-top}/README</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
+                      <sources>
+                        <source>
+                          <location>${accumulo-top}/docs</location>
+                          <excludes>
+                            <exclude>src/**</exclude>
+                          </excludes>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
+                      <sources>
+                        <source>
+                          <location>${accumulo-top}/test</location>
+                          <excludes>
+                            <exclude>src/**</exclude>
+                            <exclude>target/**</exclude>
+                            <exclude>**/walkers.txt</exclude>
+                            <exclude>**/ingesters.txt</exclude>
+                            <exclude>**/continuous-env.sh</exclude>
+                            <exclude>.*/**</exclude>
+                            <exclude>**/*.pyc</exclude>
+                            <exclude>**/*.pyo</exclude>
+                            <exclude>pom.xml</exclude>
+                          </excludes>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
+                    </mapping>
+                    <mapping>
+                      <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
+                      <directoryIncluded>false</directoryIncluded>
+                      <filemode>755</filemode>
+                      <username>root</username>
+                      <groupname>root</groupname>
+                      <sources>
+                        <source>
+                          <location>${accumulo-top}/bin</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
+                      <sources>
+                        <source>
+                          <location>${accumulo-top}/conf</location>
+                          <excludes>
+                            <exclude>${accumulo-top}/**/accumulo-site.xml</exclude>
+                            <exclude>${accumulo-top}/**/accumulo-env.sh</exclude>
+                            <exclude>${accumulo-top}/**/accumulo-metrics.xml</exclude>
+                            <exclude>${accumulo-top}/**/test-*</exclude>
+                            <exclude>${accumulo-top}/**/slaves</exclude>
+                            <exclude>${accumulo-top}/**/masters</exclude>
+                            <exclude>${accumulo-top}/**/tracers</exclude>
+                            <exclude>${accumulo-top}/**/gc</exclude>
+                            <exclude>${accumulo-top}/**/monitor</exclude>
+                          </excludes>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
+                      <sources>
+                        <source>
+                          <location>${accumulo-top}/lib</location>
+                          <includes>
+                            <include>*.jar</include>
+                          </includes>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/opt/accumulo/accumulo-${project.version}/lib/ext</directory>
+                    </mapping>
+                  </mappings>
+                </configuration>
+              </execution>
+              <execution>
+                <id>build-native-libs-rpm</id>
+                <goals>
+                  <goal>attached-rpm</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <name>accumulo-native</name>
+                  <classifier>native</classifier>
+                  <needarch>x86_64</needarch>
+                  <provides>
+                    <provide>accumulo-native</provide>
+                  </provides>
+                  <requires>
+                    <require>accumulo-server</require>
+                  </requires>
+                  <mappings>
+                    <mapping>
+                      <directory>/opt/accumulo/accumulo-${project.version}/lib/native/map</directory>
+                      <sources>
+                        <source>
+                          <location>${accumulo-top}/lib/native/map</location>
+                          <includes>
+                            <include>libNativeMap-Linux-amd64-64.so</include>
+                          </includes>
+                        </source>
+                      </sources>
+                    </mapping>
+                  </mappings>
+                </configuration>
               </execution>
             </executions>
           </plugin>
@@ -286,6 +332,7 @@
                 </goals>
                 <phase>package</phase>
                 <configuration>
+                  <deb>${project.build.directory}/accumulo-${version}.deb</deb>
                   <classifier>bin</classifier>
                   <controlDir>assemble/deb/accumulo</controlDir>
                   <installDir>/usr/lib/accumulo</installDir>
@@ -370,9 +417,10 @@
                 </goals>
                 <phase>package</phase>
                 <configuration>
+                  <deb>${project.build.directory}/accumulo-native-${version}.deb</deb>
                   <controlDir>assemble/deb/accumulo-native</controlDir>
                   <installDir>/usr/lib/accumulo</installDir>
-                  <classifier>native-libs</classifier>
+                  <classifier>native</classifier>
                   <dataSet>
                     <data>
                       <src>${accumulo-top}/server/src/main/c++</src>
@@ -409,9 +457,10 @@
                 </goals>
                 <phase>package</phase>
                 <configuration>
+                  <deb>${project.build.directory}/accumulo-test-${version}.deb</deb>
                   <controlDir>assemble/deb/accumulo-test</controlDir>
                   <installDir>/usr/lib/accumulo</installDir>
-                  <classifier>tests</classifier>
+                  <classifier>test</classifier>
                   <dataSet>
                     <data>
                       <src>${accumulo-top}/test</src>

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1478902-1479000

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1478902-1479000

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1478902-1479000

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1478902-1479000

Modified: accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1479020&r1=1479019&r2=1479020&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Sat May  4 00:56:00 2013
@@ -108,7 +108,7 @@
     <accumulo.release.version>${project.version}</accumulo.release.version>
     <!-- arguments for the release plugin goals;
          these are in addition to apache-release defined in the parent POM -->
-    <arguments>-P seal-jars,check-licenses,thrift,dist,assemble,docs,rpm,deb</arguments>
+    <arguments>-P seal-jars,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
     <!-- only prompt once for the next version -->
     <autoVersionSubmodules>true</autoVersionSubmodules>
     <!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1478902-1479000

Modified: accumulo/trunk/proxy/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/pom.xml?rev=1479020&r1=1479019&r2=1479020&view=diff
==============================================================================
--- accumulo/trunk/proxy/pom.xml (original)
+++ accumulo/trunk/proxy/pom.xml Sat May  4 00:56:00 2013
@@ -102,7 +102,7 @@
       <artifactId>accumulo-examples-simple</artifactId>
       <scope>test</scope>
     </dependency>
-   <dependency>
+    <dependency>
       <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-test</artifactId>
       <scope>test</scope>

Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java?rev=1479020&r1=1479019&r2=1479020&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java Sat May  4 00:56:00
2013
@@ -25,7 +25,7 @@ import java.util.Properties;
 
 import org.apache.accumulo.core.cli.Help;
 import org.apache.accumulo.proxy.thrift.AccumuloProxy;
-import org.apache.accumulo.server.test.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TProcessor;
 import org.apache.thrift.protocol.TCompactProtocol;

Modified: accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1479020&r1=1479019&r2=1479020&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java (original)
+++ accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java Sat May 
4 00:56:00 2013
@@ -81,7 +81,7 @@ import org.apache.accumulo.proxy.thrift.
 import org.apache.accumulo.proxy.thrift.UnknownScanner;
 import org.apache.accumulo.proxy.thrift.UnknownWriter;
 import org.apache.accumulo.proxy.thrift.WriterOptions;
-import org.apache.accumulo.server.test.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
 import org.apache.accumulo.server.util.PortUtils;
 import org.apache.accumulo.test.functional.SlowIterator;
 import org.apache.commons.io.FileUtils;

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1478902-1479000

Modified: accumulo/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/pom.xml?rev=1479020&r1=1479019&r2=1479020&view=diff
==============================================================================
--- accumulo/trunk/server/pom.xml (original)
+++ accumulo/trunk/server/pom.xml Sat May  4 00:56:00 2013
@@ -111,6 +111,16 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <pluginManagement>
@@ -129,7 +139,7 @@
   </build>
   <profiles>
     <profile>
-      <id>dist</id>
+      <id>native</id>
       <build>
         <plugins>
           <plugin>
@@ -141,7 +151,7 @@
                 <goals>
                   <goal>exec</goal>
                 </goals>
-                <phase>package</phase>
+                <phase>compile</phase>
                 <configuration>
                   <executable>make</executable>
                   <workingDirectory>${basedir}/src/main/c++</workingDirectory>

Modified: accumulo/trunk/server/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/test/resources/log4j.properties?rev=1479020&r1=1479019&r2=1479020&view=diff
==============================================================================
--- accumulo/trunk/server/src/test/resources/log4j.properties (original)
+++ accumulo/trunk/server/src/test/resources/log4j.properties Sat May  4 00:56:00 2013
@@ -16,6 +16,7 @@
 log4j.rootLogger=INFO, CA
 log4j.appender.CA=org.apache.log4j.ConsoleAppender
 log4j.appender.CA.layout=org.apache.log4j.PatternLayout
-log4j.appender.CA.layout.ConversionPattern=[%t} %-5p %c %x - %m%n
+log4j.appender.CA.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 
 log4j.logger.org.apache.accumulo.server.util.TabletIterator=ERROR
+log4j.logger.org.apache.accumulo.core.client.impl.ServerClient=ERROR

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1478902-1479000

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java?rev=1479020&r1=1479019&r2=1479020&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
(original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
Sat May  4 00:56:00 2013
@@ -22,7 +22,7 @@ import java.util.List;
 
 import org.apache.accumulo.fate.zookeeper.ZooLock.AsyncLockWatcher;
 import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason;
-import org.apache.accumulo.server.test.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.zookeeper.CreateMode;

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java?rev=1479020&r1=1479019&r2=1479020&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java Sat May
 4 00:56:00 2013
@@ -27,8 +27,8 @@ import org.apache.accumulo.core.client.I
 import org.apache.accumulo.core.client.ZooKeeperInstance;
 import org.apache.accumulo.core.client.admin.TableOperations;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.server.test.MiniAccumuloCluster;
-import org.apache.accumulo.server.test.MiniAccumuloConfig;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloConfig;
 import org.apache.hadoop.io.Text;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1479020&r1=1479019&r2=1479020&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Sat May
 4 00:56:00 2013
@@ -47,8 +47,8 @@ import org.apache.accumulo.core.file.Fil
 import org.apache.accumulo.core.file.FileSKVWriter;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.server.test.MiniAccumuloCluster;
-import org.apache.accumulo.server.test.MiniAccumuloConfig;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloConfig;
 import org.apache.accumulo.server.trace.TraceServer;
 import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.conf.Configuration;

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java?rev=1479020&r1=1479019&r2=1479020&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java Sat
May  4 00:56:00 2013
@@ -44,7 +44,7 @@ import org.apache.accumulo.core.data.Mut
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
-import org.apache.accumulo.server.test.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
 import org.apache.hadoop.io.Text;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java?rev=1479020&r1=1479019&r2=1479020&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
(original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
Sat May  4 00:56:00 2013
@@ -35,7 +35,7 @@ import org.apache.accumulo.core.data.Ran
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.accumulo.server.test.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
 import org.apache.hadoop.io.Text;
 import org.junit.After;
 import org.junit.Before;



Mime
View raw message