[Bigdata-commit] SF.net SVN: bigdata:[3590] branches/maven_scaleout/bigdata-core/src/test/ deploy/testing/data/com/bigdata/jini/start/config/testfed.config

[<ble...@us...>]

Revision: 3590
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3590&view=rev
Author:   blevine218
Date:     2010-09-20 16:46:06 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
set federation name using ConfigDeployUtil.getFederationName() rather than relying directly on the federation.name system property.

Modified Paths:
--------------
    branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config

Modified: branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config	2010-09-20 16:39:39 UTC (rev 3589)
+++ branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config	2010-09-20 16:46:06 UTC (rev 3590)
@@ -31,7 +31,7 @@
 
 bigdata {
 
-    fedname = System.getProperty("federation.name","testFed");
+	fedname = ConfigDeployUtil.getFederationName();
     zrootname = System.getProperty("bigdata.zrootname","testZroot");
 
     // logging configuration (value is a URI!)
@@ -130,7 +130,7 @@
 	"-server",
 	"-ea",
 	"-Dcom.sun.jini.jeri.tcp.useNIO=true",
-        "-Djava.security.policy="+ConfigMath.getAbsolutePath(new File("policy.all"))
+    "-Djava.security.policy="+ConfigUtil.concat( new String[] { appDotHome, "${/}testing${/}conf${/}policy.all" } )
     };
 
     // Optional classpath components.


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