Author: kturner Date: Fri May 3 19:00:05 2013 New Revision: 1478927 URL: http://svn.apache.org/r1478927 Log: ACCUMULO-14 move MAC to server module ACCUMULO-1360 added apache header
Added: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/ - copied from r1478901, accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloCluster.java - copied unchanged from r1478901, accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloCluster.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloConfig.java - copied unchanged from r1478901, accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloConfig.java Removed: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloConfig.java Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/docs/examples/README.classpath 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 (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/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/MiniAccumuloClusterTest.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:r1478626-1478774,1478776-1478876,1478878-1478901 Propchange: accumulo/trunk/assemble/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/assemble:r1478497-1478510,1478512-1478774,1478776-1478876,1478878-1478901 Propchange: accumulo/trunk/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/core:r1478497-1478510,1478512-1478774,1478776-1478876,1478878-1478901 Modified: accumulo/trunk/docs/examples/README.classpath URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.classpath?rev=1478927&r1=1478926&r2=1478927&view=diff ============================================================================== --- accumulo/trunk/docs/examples/README.classpath (original) +++ accumulo/trunk/docs/examples/README.classpath Fri May 3 19:00:05 2013 @@ -1,3 +1,22 @@ +Title: Apache Accumulo Client Examples +Notice: 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. + + This example shows how to use per table classpaths. The example leverages a test jar which contains a Filter that supresses rows containing "foo". The example shows copying the FooFilter.jar into HDFS and then making an Accumulo Propchange: accumulo/trunk/examples/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/examples:r1478497-1478510,1478512-1478774,1478776-1478876,1478878-1478901 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:r1478497-1478510,1478512-1478774,1478776-1478876,1478878-1478901 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:r1478497-1478510,1478512-1478774,1478776-1478876,1478878-1478901 Propchange: accumulo/trunk/pom.xml ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/pom.xml:r1478497-1478510,1478512-1478774,1478776-1478876,1478878-1478901 Modified: accumulo/trunk/proxy/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/pom.xml?rev=1478927&r1=1478926&r2=1478927&view=diff ============================================================================== --- accumulo/trunk/proxy/pom.xml (original) +++ accumulo/trunk/proxy/pom.xml Fri May 3 19:00:05 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/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=1478927&r1=1478926&r2=1478927&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 Fri May 3 19:00:05 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/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=1478927&r1=1478926&r2=1478927&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 Fri May 3 19:00:05 2013 @@ -81,8 +81,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; Propchange: accumulo/trunk/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/server:r1478497-1478510,1478512-1478774,1478776-1478876,1478878-1478901 Propchange: accumulo/trunk/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/src:r1478497-1478510,1478512-1478774,1478776-1478876,1478878-1478901 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=1478927&r1=1478926&r2=1478927&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 Fri May 3 19:00:05 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/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=1478927&r1=1478926&r2=1478927&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 Fri May 3 19:00:05 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/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java?rev=1478927&r1=1478926&r2=1478927&view=diff ============================================================================== --- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java (original) +++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java Fri May 3 19:00:05 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/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=1478927&r1=1478926&r2=1478927&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 Fri May 3 19:00:05 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/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=1478927&r1=1478926&r2=1478927&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 Fri May 3 19:00:05 2013 @@ -44,6 +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.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=1478927&r1=1478926&r2=1478927&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 Fri May 3 19:00:05 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;