Revision: 3589
http://bigdata.svn.sourceforge.net/bigdata/?rev=3589&view=rev
Author: blevine218
Date: 2010-09-20 16:39:39 +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/testfed.config
Modified: branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config 2010-09-20 12:04:22 UTC (rev 3588)
+++ branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config 2010-09-20 16:39:39 UTC (rev 3589)
@@ -28,10 +28,10 @@
import com.bigdata.util.config.NicUtil;
import com.sun.jini.config.ConfigUtil;
+import com.bigdata.util.config.ConfigDeployUtil;
bigdata {
-
- fedname = System.getProperty("federation.name","testFed");
+ static fedname = ConfigDeployUtil.getFederationName();
zrootname = System.getProperty("bigdata.zrootname","testZroot");
// logging configuration (value is a URI!)
@@ -87,6 +87,9 @@
*/
com.bigdata.jini.start.config.ServiceConfiguration {
+ private static appDotHome =
+ System.getProperty("app.home", ConfigMath.getAbsolutePath(new File(".")) );
+
// Optional command line arguments.
//args=new String[]{};
@@ -100,7 +103,7 @@
"-server",
"-ea",
"-Dcom.sun.jini.jeri.tcp.useNIO=true",
- "-Djava.security.policy="+ConfigUtil.concat( new String[] { appHome, "${/}testing${/}conf${/}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.
|
