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 23:00:40 UTC
svn commit: r1478977 - 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/test/ src/server/src/test/java/org...

Author: kturner
Date: Fri May  3 21:00:23 2013
New Revision: 1478977

URL: http://svn.apache.org/r1478977
Log:
ACCUMULO-14 move MAC to server module

Added:
    accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloCluster.java
      - copied, changed from r1478936, accumulo/branches/1.4/src/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java
    accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloConfig.java
      - copied, changed from r1478936, accumulo/branches/1.4/src/test/src/main/java/org/apache/accumulo/test/MiniAccumuloConfig.java
    accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/test/MiniAccumuloClusterTest.java
      - copied, changed from r1478936, accumulo/branches/1.4/src/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java
    accumulo/branches/1.4/src/server/src/test/resources/
    accumulo/branches/1.4/src/server/src/test/resources/log4j.properties
      - copied unchanged from r1478936, accumulo/branches/1.4/src/test/src/main/resources/log4j.properties
Removed:
    accumulo/branches/1.4/src/test/
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=1478977&r1=1478976&r2=1478977&view=diff
==============================================================================
--- accumulo/branches/1.4/pom.xml (original)
+++ accumulo/branches/1.4/pom.xml Fri May  3 21:00:23 2013
@@ -37,7 +37,6 @@
     <module>src/start</module>
     <module>src/examples</module>
     <module>src/proxy</module>
-    <module>src/test</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=1478977&r1=1478976&r2=1478977&view=diff
==============================================================================
--- accumulo/branches/1.4/src/proxy/pom.xml (original)
+++ accumulo/branches/1.4/src/proxy/pom.xml Fri May  3 21:00:23 2013
@@ -77,12 +77,6 @@
         <scope>compile</scope>
     </dependency>
     <dependency>
-        <groupId>org.apache.accumulo</groupId>
-        <artifactId>accumulo-test</artifactId>
-        <version>${project.version}</version>
-        <scope>compile</scope>
-    </dependency>
-    <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-core</artifactId>
         <scope>compile</scope>

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=1478977&r1=1478976&r2=1478977&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 Fri May  3 21:00:23 2013
@@ -23,7 +23,7 @@ import java.lang.reflect.Constructor;
 import java.util.Properties;
 
 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.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=1478977&r1=1478976&r2=1478977&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 Fri May  3 21:00:23 2013
@@ -74,9 +74,9 @@ 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.test.functional.SlowIterator;
 import org.apache.accumulo.server.util.PortUtils;
-import org.apache.accumulo.test.MiniAccumuloCluster;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;

Copied: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloCluster.java (from r1478936, accumulo/branches/1.4/src/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java)
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloCluster.java?p2=accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloCluster.java&p1=accumulo/branches/1.4/src/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java&r1=1478936&r2=1478977&rev=1478977&view=diff
==============================================================================
--- accumulo/branches/1.4/src/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java (original)
+++ accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloCluster.java Fri May  3 21:00:23 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;

Copied: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloConfig.java (from r1478936, accumulo/branches/1.4/src/test/src/main/java/org/apache/accumulo/test/MiniAccumuloConfig.java)
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloConfig.java?p2=accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloConfig.java&p1=accumulo/branches/1.4/src/test/src/main/java/org/apache/accumulo/test/MiniAccumuloConfig.java&r1=1478936&r2=1478977&rev=1478977&view=diff
==============================================================================
--- accumulo/branches/1.4/src/test/src/main/java/org/apache/accumulo/test/MiniAccumuloConfig.java (original)
+++ accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MiniAccumuloConfig.java Fri May  3 21:00:23 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;

Copied: accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/test/MiniAccumuloClusterTest.java (from r1478936, accumulo/branches/1.4/src/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java)
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/test/MiniAccumuloClusterTest.java?p2=accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/test/MiniAccumuloClusterTest.java&p1=accumulo/branches/1.4/src/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java&r1=1478936&r2=1478977&rev=1478977&view=diff
==============================================================================
--- accumulo/branches/1.4/src/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java (original)
+++ accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/test/MiniAccumuloClusterTest.java Fri May  3 21:00:23 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.util.Collections;
 import java.util.Map.Entry;
@@ -36,6 +36,7 @@ import org.apache.accumulo.core.security
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.server.test.MiniAccumuloCluster;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.junit.AfterClass;