You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/05/03 20:20:32 UTC
svn commit: r1478896 - in /accumulo/branches/1.5: proxy/
proxy/src/main/java/org/apache/accumulo/proxy/
proxy/src/test/java/org/apache/accumulo/proxy/
server/src/main/java/org/apache/accumulo/server/test/
test/src/main/java/org/apache/accumulo/test/ te...
Author: kturner
Date: Fri May 3 18:20:31 2013
New Revision: 1478896
URL: http://svn.apache.org/r1478896
Log:
ACCUMULO-14 move MAC to server module
Added:
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloCluster.java
- copied, changed from r1478491, accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloConfig.java
- copied, changed from r1478491, accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloConfig.java
Removed:
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloConfig.java
Modified:
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
Modified: accumulo/branches/1.5/proxy/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/pom.xml?rev=1478896&r1=1478895&r2=1478896&view=diff
==============================================================================
--- accumulo/branches/1.5/proxy/pom.xml (original)
+++ accumulo/branches/1.5/proxy/pom.xml Fri May 3 18:20:31 2013
@@ -79,11 +79,6 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-test</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-trace</artifactId>
<scope>provided</scope>
</dependency>
@@ -107,6 +102,11 @@
<artifactId>accumulo-examples-simple</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
Modified: accumulo/branches/1.5/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java?rev=1478896&r1=1478895&r2=1478896&view=diff
==============================================================================
--- accumulo/branches/1.5/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java (original)
+++ accumulo/branches/1.5/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java Fri May 3 18:20:31 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.test.MiniAccumuloCluster;
+import org.apache.accumulo.server.test.MiniAccumuloCluster;
import org.apache.log4j.Logger;
import org.apache.thrift.TProcessor;
import org.apache.thrift.protocol.TCompactProtocol;
Modified: accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1478896&r1=1478895&r2=1478896&view=diff
==============================================================================
--- accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java (original)
+++ accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java Fri May 3 18:20:31 2013
@@ -80,8 +80,8 @@ 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.util.PortUtils;
-import org.apache.accumulo.test.MiniAccumuloCluster;
import org.apache.accumulo.test.functional.SlowIterator;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
Copied: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloCluster.java (from r1478491, accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java)
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloCluster.java?p2=accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloCluster.java&p1=accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java&r1=1478491&r2=1478896&rev=1478896&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java (original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloCluster.java Fri May 3 18:20:31 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.test;
+package org.apache.accumulo.server.test;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -120,7 +120,7 @@ public class MiniAccumuloCluster {
private MiniAccumuloConfig config;
private Process[] tabletServerProcesses;
- Process exec(Class<? extends Object> clazz, String... args) throws IOException {
+ private Process exec(Class<? extends Object> clazz, String... args) throws IOException {
String javaHome = System.getProperty("java.home");
String javaBin = javaHome + File.separator + "bin" + File.separator + "java";
String classpath = System.getProperty("java.class.path");
Copied: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloConfig.java (from r1478491, accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloConfig.java)
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloConfig.java?p2=accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloConfig.java&p1=accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloConfig.java&r1=1478491&r2=1478896&rev=1478896&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloConfig.java (original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloConfig.java Fri May 3 18:20:31 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.test;
+package org.apache.accumulo.server.test;
import java.io.File;
import java.util.Collections;
Modified: accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java?rev=1478896&r1=1478895&r2=1478896&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java (original)
+++ accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java Fri May 3 18:20:31 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.test.MiniAccumuloCluster;
+import org.apache.accumulo.server.test.MiniAccumuloCluster;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.zookeeper.CreateMode;
Modified: accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java?rev=1478896&r1=1478895&r2=1478896&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java (original)
+++ accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java Fri May 3 18:20:31 2013
@@ -27,6 +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.hadoop.io.Text;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Modified: accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java?rev=1478896&r1=1478895&r2=1478896&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java (original)
+++ accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java Fri May 3 18:20:31 2013
@@ -37,6 +37,7 @@ import org.apache.accumulo.core.iterator
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.server.test.MiniAccumuloCluster;
import org.apache.commons.io.FileUtils;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
Modified: accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1478896&r1=1478895&r2=1478896&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java (original)
+++ accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Fri May 3 18:20:31 2013
@@ -29,6 +29,7 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
import java.util.Map.Entry;
import jline.ConsoleReader;
@@ -46,6 +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.trace.TraceServer;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
@@ -144,7 +147,12 @@ public class ShellServerTest {
exec("quit", true);
shell.start();
shell.setExit(false);
- traceProcess = cluster.exec(TraceServer.class);
+
+ // use reflection to call this method so it does not need to be made public
+ Method method = cluster.getClass().getDeclaredMethod("exec", Class.class, String[].class);
+ method.setAccessible(true);
+ traceProcess = (Process) method.invoke(cluster, TraceServer.class, new String[0]);
+
// give the tracer some time to start
UtilWaitThread.sleep(1000);
}
Modified: accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java?rev=1478896&r1=1478895&r2=1478896&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java (original)
+++ accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java Fri May 3 18:20:31 2013
@@ -35,6 +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.hadoop.io.Text;
import org.junit.After;
import org.junit.Before;