svn commit: r1484632 - in /accumulo/branches/1.4: ./ src/proxy/ src/proxy/src/main/java/org/apache/accumulo/proxy/ src/proxy/src/test/java/org/apache/accumulo/proxy/ src/server/src/main/java/org/apache/accumulo/server/mini/ src/server/src/test/java/org...

[cjnolet]

Author: cjnolet
Date: Tue May 21 01:13:58 2013
New Revision: 1484632

URL: http://svn.apache.org/r1484632
Log:
ACCUMULO-1438 Moving MiniAccumuloCluster into its own package

Removed:
    
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloCluster.java
    
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloConfig.java
    
accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/mini/MiniAccumuloClusterTest.java
Modified:
    accumulo/branches/1.4/pom.xml
    accumulo/branches/1.4/src/proxy/pom.xml
    
accumulo/branches/1.4/src/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
    
accumulo/branches/1.4/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java

Modified: accumulo/branches/1.4/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/pom.xml?rev=1484632&r1=1484631&r2=1484632&view=diff
==============================================================================
--- accumulo/branches/1.4/pom.xml (original)
+++ accumulo/branches/1.4/pom.xml Tue May 21 01:13:58 2013
@@ -37,6 +37,7 @@
     <module>src/start</module>
     <module>src/examples</module>
     <module>src/proxy</module>
+    <module>src/mini</module>
   </modules>
 
   <build>

Modified: accumulo/branches/1.4/src/proxy/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/proxy/pom.xml?rev=1484632&r1=1484631&r2=1484632&view=diff
==============================================================================
--- accumulo/branches/1.4/src/proxy/pom.xml (original)
+++ accumulo/branches/1.4/src/proxy/pom.xml Tue May 21 01:13:58 2013
@@ -115,7 +115,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.accumulo</groupId>
-        <artifactId>accumulo-server</artifactId>
+        <artifactId>accumulo-mini</artifactId>
         <version>${project.version}</version>
     </dependency>
   </dependencies>

Modified: 
accumulo/branches/1.4/src/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java?rev=1484632&r1=1484631&r2=1484632&view=diff
==============================================================================
--- 
accumulo/branches/1.4/src/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
 (original)
+++ 
accumulo/branches/1.4/src/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
 Tue May 21 01:13:58 2013
@@ -16,14 +16,9 @@
  */
 package org.apache.accumulo.proxy;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.util.Properties;
-
+import com.google.common.io.Files;
+import org.apache.accumulo.mini.MiniAccumuloCluster;
 import org.apache.accumulo.proxy.thrift.AccumuloProxy;
-import org.apache.accumulo.server.mini.MiniAccumuloCluster;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TProcessor;
 import org.apache.thrift.protocol.TCompactProtocol;
@@ -33,7 +28,11 @@ import org.apache.thrift.server.TServer;
 import org.apache.thrift.transport.TFramedTransport;
 import org.apache.thrift.transport.TNonblockingServerSocket;
 
-import com.google.common.io.Files;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.util.Properties;
 
 public class Proxy {
   

Modified: 
accumulo/branches/1.4/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1484632&r1=1484631&r2=1484632&view=diff
==============================================================================
--- 
accumulo/branches/1.4/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
 (original)
+++ 
accumulo/branches/1.4/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
 Tue May 21 01:13:58 2013
@@ -49,6 +49,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.iterators.user.SummingCombiner;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint;
+import org.apache.accumulo.mini.MiniAccumuloCluster;
 import org.apache.accumulo.proxy.thrift.AccumuloException;
 import org.apache.accumulo.proxy.thrift.AccumuloProxy.Client;
 import org.apache.accumulo.proxy.thrift.AccumuloSecurityException;
@@ -74,7 +75,6 @@ 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.mini.MiniAccumuloCluster;
 import org.apache.accumulo.server.test.functional.SlowIterator;
 import org.apache.accumulo.server.util.PortUtils;
 import org.apache.hadoop.conf.Configuration;
@@ -133,7 +133,7 @@ public class SimpleTest {
     Properties props = new Properties();
     props.put("instance", accumulo.getInstanceName());
     props.put("zookeepers", accumulo.getZooKeepers());
-
+    
     protocolClass = getRandomProtocol();
     System.out.println(protocolClass.getName());
     
@@ -325,7 +325,7 @@ public class SimpleTest {
       client.hasNext(scanner);
       fail("exception not thrown");
     } catch (UnknownScanner us) {}
-
+    
     try {
       client.closeScanner(scanner);
       fail("exception not thrown");
@@ -365,7 +365,7 @@ public class SimpleTest {
     
     // this is a oneway call, so it does not throw exceptions
     client.update(writer, mutation("row2", "cf", "cq", "value2"));
-
+    
     try {
       client.flush(writer);
       fail("exception not thrown");