[Bigdata-commit] SF.net SVN: bigdata:[3377] branches/dev-btm

[<btm...@us...>]

Revision: 3377
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3377&view=rev
Author:   btmurphy
Date:     2010-07-30 20:41:35 +0000 (Fri, 30 Jul 2010)

Log Message:
-----------
[branch dev-btm]: fixed a typo in JiniServicesHelper that prevented TestBigdataClient from passing when run on eclipse

Modified Paths:
--------------
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/JiniServicesHelper.java
    branches/dev-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config
    branches/dev-btm/src/resources/config/bigdataCluster.config

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/JiniServicesHelper.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/JiniServicesHelper.java	2010-07-30 18:49:37 UTC (rev 3376)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/JiniServicesHelper.java	2010-07-30 20:41:35 UTC (rev 3377)
@@ -586,7 +586,7 @@
     optionsList.add(options[i]);
 }
 String joinGroupsOverrideStr = 
-                   "com.bigdata.loadblancer.groupsToJoin=new String[] "
+                   "com.bigdata.loadbalancer.groupsToJoin=new String[] "
                    +"{"
                    +"\""+fedname+"\""
                    +"}";

Modified: branches/dev-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config
===================================================================
--- branches/dev-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config	2010-07-30 18:49:37 UTC (rev 3376)
+++ branches/dev-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config	2010-07-30 20:41:35 UTC (rev 3377)
@@ -36,6 +36,14 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit.*;
 
+import java.net.NetworkInterface;
+import net.jini.constraint.BasicMethodConstraints;
+import net.jini.core.constraint.ConnectionRelativeTime;
+import net.jini.core.constraint.InvocationConstraints;
+import net.jini.discovery.LookupDiscoveryManager;
+import com.bigdata.util.config.NicUtil;
+import com.bigdata.util.config.ConfigDeployUtil;
+
 /*
  * This is a standalone configuration file for a bigdata federation
  * used for unit tests in conjunction with the JiniServicesHelper class.
@@ -431,6 +439,61 @@
 
 }
 
+com.bigdata.loadbalancer {
+
+    private static exportIpAddr = 
+        NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
+    private static exportPort = 
+        Integer.parseInt( System.getProperty("exportPort", "0") );
+
+    groupsToJoin = ConfigDeployUtil.getGroupsToDiscover();
+    locatorsToJoin = ConfigDeployUtil.getLocatorsToDiscover();
+
+    private static exporterTcpServerEndpoint = 
+        TcpServerEndpoint.getInstance(exportIpAddr, exportPort);
+    private static serverILFactory =
+        new BasicILFactory(
+            new BasicMethodConstraints(
+                new InvocationConstraints(
+                    new ConnectionRelativeTime(
+                        ConfigDeployUtil.getLong(
+                            "rmi.connectTimeout")),
+                    null)),
+            null);
+
+    serverExporter = 
+        new BasicJeriExporter
+            (TcpServerEndpoint.getInstance(exportIpAddr,exportPort),
+                                           serverILFactory,
+                                           false,
+                                           true);
+
+    discoveryManager = new LookupDiscoveryManager(groupsToJoin,
+                                                         locatorsToJoin,
+                                                         null,
+                                                         this);
+    // Where service state is persisted
+    persistenceDirectory = 
+        ConfigUtil.concat
+            ( new String[] { System.getProperty("app.home", "${user.dir}"), 
+                             "${/}var${/}state${/}loadbalancerState" } );
+}
+
+net.jini.discovery.LookupDiscovery {
+    multicastRequestHost = com.bigdata.loadbalancer.exportIpAddr;
+    multicastInterfaces = new NetworkInterface[] {
+        NicUtil.getNetworkInterface(com.bigdata.loadbalancer.exportIpAddr)
+    };
+}
+
+net.jini.lookup.ServiceDiscoveryManager {
+    eventListenerExporter = 
+        new BasicJeriExporter
+            (com.bigdata.loadbalancer.exporterTcpServerEndpoint,
+             com.bigdata.loadbalancer.serverILFactory, false, false);
+}
+
+
 /*
  * Note: Whitespace intentionally follows this comment!
  */

Modified: branches/dev-btm/src/resources/config/bigdataCluster.config
===================================================================
--- branches/dev-btm/src/resources/config/bigdataCluster.config	2010-07-30 18:49:37 UTC (rev 3376)
+++ branches/dev-btm/src/resources/config/bigdataCluster.config	2010-07-30 20:41:35 UTC (rev 3377)
@@ -1201,7 +1201,6 @@
         "-Dlog4j.primary.configuration=@NAS@/dist/bigdata/var/config/logging/loadbalancer-logging.properties",
         "-DusingServicesManagerService=true",
         "-Dbigdata.logDir=@NAS@/dist/bigdata/var/log",
-        "-DappHome=@NAS@/dist/bigdata",
         "-DappHome=@APP_HOME@",
         "-Dconfig=@NAS@/dist/bigdata/var/config/jini/loadbalancer.config"
     };


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