From e0c8f1d26591144fd4e248d61010fd5d6048e180 Mon Sep 17 00:00:00 2001
From: Manik Surtani <manik@surtani.org>
Date: Mon, 7 Dec 2009 12:18:48 +0000
Subject: [PATCH] Updated to remove dependency on a custom JGroups cfg

---
 .../lucenedemo/DirectoryFactory.java          | 13 +++--
 .../main/resources/jgroups-configuration.xml  | 57 -------------------
 2 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 100644 demos/lucene-directory/src/main/resources/jgroups-configuration.xml

diff --git a/demos/lucene-directory/src/main/java/org/infinispan/lucenedemo/DirectoryFactory.java b/demos/lucene-directory/src/main/java/org/infinispan/lucenedemo/DirectoryFactory.java
index be530bfa8d4b..fb897daee64e 100644
--- a/demos/lucene-directory/src/main/java/org/infinispan/lucenedemo/DirectoryFactory.java
+++ b/demos/lucene-directory/src/main/java/org/infinispan/lucenedemo/DirectoryFactory.java
@@ -21,10 +21,6 @@
  */
 package org.infinispan.lucenedemo;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
 import org.infinispan.Cache;
 import org.infinispan.config.Configuration;
 import org.infinispan.config.GlobalConfiguration;
@@ -35,6 +31,10 @@
 import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
 import org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
 /**
  * Utility to create a Directory for the demo.
  * 
@@ -59,7 +59,10 @@ public static synchronized CacheManager getCacheManager() {
       gc.setClusterName("infinispan-lucene-demo-cluster");
       gc.setTransportClass(JGroupsTransport.class.getName());
       Properties p = new Properties();
-      p.setProperty("configurationFile", "jgroups-configuration.xml");
+
+      // use the default that ships with Infinispan! - Manik Surtani, 7-Dec-2009
+//      p.setProperty("configurationFile", "jgroups-configuration.xml");
+
       gc.setTransportProperties(p);
 
       Configuration config = new Configuration();
diff --git a/demos/lucene-directory/src/main/resources/jgroups-configuration.xml b/demos/lucene-directory/src/main/resources/jgroups-configuration.xml
deleted file mode 100644
index 83546c4aca6a..000000000000
--- a/demos/lucene-directory/src/main/resources/jgroups-configuration.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<config xmlns="urn:org:jgroups"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-2.8.xsd">
-   <UDP
-         mcast_addr="${jgroups.udp.mcast_addr:228.6.7.8}"
-         mcast_port="${jgroups.udp.mcast_port:46655}"
-         tos="8"
-         ucast_recv_buf_size="20000000"
-         ucast_send_buf_size="640000"
-         mcast_recv_buf_size="25000000"
-         mcast_send_buf_size="640000"
-         loopback="false"
-         discard_incompatible_packets="true"
-         max_bundle_size="64000"
-         max_bundle_timeout="30"
-         ip_ttl="${jgroups.udp.ip_ttl:2}"
-         enable_bundling="true"
-         enable_diagnostics="false"
-
-         thread_naming_pattern="pl"
-
-         thread_pool.enabled="true"
-         thread_pool.min_threads="2"
-         thread_pool.max_threads="30"
-         thread_pool.keep_alive_time="5000"
-         thread_pool.queue_enabled="false"
-         thread_pool.queue_max_size="100"
-         thread_pool.rejection_policy="Discard"
-
-         oob_thread_pool.enabled="true"
-         oob_thread_pool.min_threads="2"
-         oob_thread_pool.max_threads="30"
-         oob_thread_pool.keep_alive_time="5000"
-         oob_thread_pool.queue_enabled="false"
-         oob_thread_pool.queue_max_size="100"
-         oob_thread_pool.rejection_policy="Discard"
-         />
-
-   <PING timeout="3000" num_initial_members="3"/>
-   <MERGE2 max_interval="30000" min_interval="10000"/>
-   <FD_SOCK/>
-   <FD_ALL/>
-   <BARRIER />
-   <pbcast.NAKACK use_stats_for_retransmission="false"
-                   exponential_backoff="0"
-                   use_mcast_xmit="true" gc_lag="0"
-                   retransmit_timeout="300,600,1200"
-                   discard_delivered_msgs="true"/>
-   <UNICAST timeout="300,600,1200"/>
-   <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="1000000"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="true"/>
-   <FC max_credits="500000" min_threshold="0.20"/>
-   <FRAG2 frag_size="60000"  />
-   <!--<pbcast.STREAMING_STATE_TRANSFER/>-->
-   <pbcast.STATE_TRANSFER/>
-   <pbcast.FLUSH timeout="0"/>
-</config>