[Bigdata-commit] SF.net SVN: bigdata:[8043] branches/BIGDATA_RELEASE_1_3_0/src/resources

[<tho...@us...>]

Revision: 8043
          http://sourceforge.net/p/bigdata/code/8043
Author:   thompsonbry
Date:     2014-04-04 14:48:24 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
Define DATA_DIR as the location of the journal file as an environment variable that is passed through from startHAServices and used by HAJournal.config.

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/HAJournal.config
    branches/BIGDATA_RELEASE_1_3_0/src/resources/bin/startHAServices

Modified: branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/HAJournal.config
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/HAJournal.config	2014-04-03 23:39:45 UTC (rev 8042)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/HAJournal/HAJournal.config	2014-04-04 14:48:24 UTC (rev 8043)
@@ -83,7 +83,7 @@
    private static serviceDir = new File(fedDir,logicalServiceId+File.separator+"HAJournalServer");
    
    // journal data directory.
-   private static dataDir = serviceDir;
+   private static dataDir = new File(ConfigMath.getProperty("DATA_DIR",serviceDir.toString());
 
    // HA log directory.
    private static haLogDir = new File(serviceDir,"HALog");

Modified: branches/BIGDATA_RELEASE_1_3_0/src/resources/bin/startHAServices
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/bin/startHAServices	2014-04-03 23:39:45 UTC (rev 8042)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/bin/startHAServices	2014-04-04 14:48:24 UTC (rev 8043)
@@ -75,6 +75,7 @@
  -DFEDNAME=${FEDNAME}\
  -DLOGICAL_SERVICE_ID=${LOGICAL_SERVICE_ID}\
  -DFED_DIR=${FED_DIR}\
+ -DDATA_DIR=${DATA_DIR}\
  -DREPLICATION_FACTOR=${REPLICATION_FACTOR}\
  -DHA_PORT=${HA_PORT}\
  "-Djetty.port=${JETTY_PORT}"\

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.