You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by si...@apache.org on 2011/01/13 13:25:41 UTC

svn commit: r1058532 - in /incubator/river/jtsk/trunk/src/org/apache/river/config/builder: TextConfigurationBuilder.java template.config

Author: sijskes
Date: Thu Jan 13 12:25:40 2011
New Revision: 1058532

URL: http://svn.apache.org/viewvc?rev=1058532&view=rev
Log:
disable multicast option

Modified:
    incubator/river/jtsk/trunk/src/org/apache/river/config/builder/TextConfigurationBuilder.java
    incubator/river/jtsk/trunk/src/org/apache/river/config/builder/template.config

Modified: incubator/river/jtsk/trunk/src/org/apache/river/config/builder/TextConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/config/builder/TextConfigurationBuilder.java?rev=1058532&r1=1058531&r2=1058532&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/config/builder/TextConfigurationBuilder.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/config/builder/TextConfigurationBuilder.java Thu Jan 13 12:25:40 2011
@@ -50,6 +50,8 @@ public class TextConfigurationBuilder
 
     private String codebase = "" ;
 
+    private boolean disableMulticast = false ;
+
     public TextConfigurationBuilder()
     {
     }
@@ -114,6 +116,16 @@ public class TextConfigurationBuilder
         this.codebase = codebase;
     }
 
+    public boolean isDisableMulticast()
+    {
+        return disableMulticast;
+    }
+
+    public void setDisableMulticast(boolean disableMulticast)
+    {
+        this.disableMulticast = disableMulticast;
+    }
+
     public String getConfigurationText() throws IOException
     {
         {
@@ -128,7 +140,7 @@ public class TextConfigurationBuilder
 
         specialEntryMap.put("$group", group);
         specialEntryMap.put("$codebase", codebase);
-        
+
         InputStream is = getClass().getResourceAsStream("template.config");
         StringBuilder sb = new StringBuilder();
         while(true) {
@@ -140,7 +152,18 @@ public class TextConfigurationBuilder
         }
         is.close();
 
-        return sb.toString();
+        String buf = sb.toString();
+
+        {
+            String mcstr = "" ;
+            if( disableMulticast ) {
+                mcstr = "multicastInterfaces = new java.net.NetworkInterface[] { } ;" ;
+            }
+
+            buf = buf.replaceAll("%REGGIE.multicastInterfaces%", mcstr );
+        }
+
+        return buf ;
     }
 
     public class ConfigurationFile2

Modified: incubator/river/jtsk/trunk/src/org/apache/river/config/builder/template.config
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/config/builder/template.config?rev=1058532&r1=1058531&r2=1058532&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/config/builder/template.config (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/config/builder/template.config Thu Jan 13 12:25:40 2011
@@ -22,8 +22,8 @@ import net.jini.jeri.* ;
 
 com.sun.jini.start {
     private static codebase = $codebase ;
-    private static policy = "" ; 
-    private static classpath = "" ; 
+    private static policy = "" ;
+    private static classpath = "" ;
 
     static serviceDescriptors = new ServiceDescriptor[] {
         new NonActivatableServiceDescriptor(
@@ -39,4 +39,10 @@ com.sun.jini.reggie {
 
     static serverExporter = new BasicJeriExporter( $registryEndpoint, new BasicILFactory());
 
+    %REGGIE.multicastInterfaces%
+}
+
+net.jini.discovery.LookupDiscovery
+{
+    %REGGIE.multicastInterfaces%
 }