You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by le...@apache.org on 2014/01/07 14:36:37 UTC

svn commit: r1556212 - in /gora/branches/GORA_94: CHANGES.txt gora-cassandra/src/test/java/org/apache/gora/cassandra/GoraCassandraTestDriver.java

Author: lewismc
Date: Tue Jan  7 13:36:37 2014
New Revision: 1556212

URL: http://svn.apache.org/r1556212
Log:
port GORA-281 More flexible file locations for cassandra's config and log4j

Modified:
    gora/branches/GORA_94/CHANGES.txt
    gora/branches/GORA_94/gora-cassandra/src/test/java/org/apache/gora/cassandra/GoraCassandraTestDriver.java

Modified: gora/branches/GORA_94/CHANGES.txt
URL: http://svn.apache.org/viewvc/gora/branches/GORA_94/CHANGES.txt?rev=1556212&r1=1556211&r2=1556212&view=diff
==============================================================================
--- gora/branches/GORA_94/CHANGES.txt (original)
+++ gora/branches/GORA_94/CHANGES.txt Tue Jan  7 13:36:37 2014
@@ -6,6 +6,8 @@ Gora Change Log
 
 * GORA-94 Upgrade to Apache Avro 1.7.x  ==1st Attempt== (Ed Kohlwey via lewismc)
 
+* GORA-281 More flexible file locations for cassandra's config and log4j (Nate McCall via hsaputra)
+
 * GORA-275 Update Gora stores to pass conf when creating instance of PartitionQueryImpl (Damien Raude-Morvan via hsaputra)
 
 * GORA-270 IOUtils static SerializationFactory field (Damien Raude-Morvan via hsaputra)

Modified: gora/branches/GORA_94/gora-cassandra/src/test/java/org/apache/gora/cassandra/GoraCassandraTestDriver.java
URL: http://svn.apache.org/viewvc/gora/branches/GORA_94/gora-cassandra/src/test/java/org/apache/gora/cassandra/GoraCassandraTestDriver.java?rev=1556212&r1=1556211&r2=1556212&view=diff
==============================================================================
--- gora/branches/GORA_94/gora-cassandra/src/test/java/org/apache/gora/cassandra/GoraCassandraTestDriver.java (original)
+++ gora/branches/GORA_94/gora-cassandra/src/test/java/org/apache/gora/cassandra/GoraCassandraTestDriver.java Tue Jan  7 13:36:37 2014
@@ -82,8 +82,8 @@ public class GoraCassandraTestDriver ext
     try {
       cleanupDirectoriesFailover();
       FileUtils.createDirectory(baseDirectory);
-      System.setProperty("log4j.configuration", "file:target/test-classes/log4j-server.properties");
-      System.setProperty("cassandra.config", "file:target/test-classes/cassandra.yaml");
+      System.setProperty("log4j.configuration", "log4j-server.properties");
+      System.setProperty("cassandra.config", "cassandra.yaml");
       
       cassandraDaemon = new CassandraDaemon();
       cassandraDaemon.init(null);