Author: kturner
Date: Tue Apr 23 13:45:21 2013
New Revision: 1470954
URL: http://svn.apache.org/r1470954
Log:
ACCUMULO-1237 ACCUMULO-1289 Applying patch from Corey Nolet that makes proxy
unit test use MiniAccumulo. The patch also minimizes diffs between the proxy
in 1.4 and 1.5.
Added:
accumulo/branches/1.4/src/proxy/src/test/resources/
accumulo/branches/1.4/src/proxy/src/test/resources/log4j.properties
Modified:
accumulo/branches/1.4/src/proxy/pom.xml
accumulo/branches/1.4/src/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
accumulo/branches/1.4/src/proxy/src/main/java/org/apache/accumulo/proxy/Util.java
accumulo/branches/1.4/src/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
accumulo/branches/1.4/src/proxy/src/main/thrift/proxy.thrift
accumulo/branches/1.4/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
accumulo/branches/1.4/src/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java
Modified: accumulo/branches/1.4/src/proxy/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/proxy/pom.xml?rev=1470954&r1=1470953&r2=1470954&view=diff
==============================================================================
--- accumulo/branches/1.4/src/proxy/pom.xml (original)
+++ accumulo/branches/1.4/src/proxy/pom.xml Tue Apr 23 13:45:21 2013
@@ -72,9 +72,15 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
- <scope>compile</scope>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-test</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
