[infinispan-commits] Infinispan SVN: r2046 - in trunk: demos/lucene-directory-demo/src/main and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: navssurtani
Date: 2010-07-16 06:25:10 -0400 (Fri, 16 Jul 2010)
New Revision: 2046

Added:
   trunk/demos/lucene-directory-demo/src/main/Main5.iml
Modified:
   trunk/core/src/main/java/org/infinispan/util/Util.java
   trunk/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolServer.scala
Log:
Overloaded start() in AbstractProtocolServer. Updated Javadoc in org.infinispan.util.Util

Modified: trunk/core/src/main/java/org/infinispan/util/Util.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/Util.java	2010-07-16 07:39:56 UTC (rev 2045)
+++ trunk/core/src/main/java/org/infinispan/util/Util.java	2010-07-16 10:25:10 UTC (rev 2046)
@@ -37,7 +37,7 @@
 import java.util.concurrent.locks.Lock;
 
 /**
- * General utility methods used throughout the JBC code base.
+ * General utility methods used throughout the Infinispan code base.
  *
  * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  * @author Galder Zamarreño

Added: trunk/demos/lucene-directory-demo/src/main/Main5.iml
===================================================================
--- trunk/demos/lucene-directory-demo/src/main/Main5.iml	                        (rev 0)
+++ trunk/demos/lucene-directory-demo/src/main/Main5.iml	2010-07-16 10:25:10 UTC (rev 2046)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Test7" />
+    <orderEntry type="module" module-name="Test3" />
+    <orderEntry type="module" module-name="Main15" />
+    <orderEntry type="module" module-name="Test9" />
+    <orderEntry type="module" module-name="Main8" />
+  </component>
+</module>
+

Modified: trunk/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolServer.scala
===================================================================
--- trunk/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolServer.scala	2010-07-16 07:39:56 UTC (rev 2045)
+++ trunk/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolServer.scala	2010-07-16 10:25:10 UTC (rev 2046)
@@ -7,6 +7,8 @@
 import org.infinispan.manager.EmbeddedCacheManager
 import org.infinispan.server.core.Main._
 import java.util.Properties
+import org.infinispan.util.Util
+import org.infinispan.util.logging.Log
 
 /**
  * // TODO: Document this
@@ -31,7 +33,7 @@
       this.workerThreads = properties.getProperty(PROP_KEY_WORKER_THREADS, WORKER_THREADS_DEFAULT).toInt
       if (workerThreads < 0)
          throw new IllegalArgumentException("Worker threads can't be lower than 0: " + masterThreads)
-      
+
       this.cacheManager = cacheManager
       val idleTimeout = properties.getProperty(PROP_KEY_IDLE_TIMEOUT, IDLE_TIMEOUT_DEFAULT).toInt
       if (idleTimeout < -1)
@@ -39,19 +41,19 @@
 
       val tcpNoDelayString = properties.getProperty(PROP_KEY_TCP_NO_DELAY, TCP_NO_DELAY_DEFAULT)
       val tcpNoDelay =
-         try {
-            tcpNoDelayString.toBoolean
-         } catch {
-            case n: NumberFormatException => {
-               throw new IllegalArgumentException("TCP no delay flag switch must be a boolean: " + tcpNoDelayString)
-            }
+      try {
+         tcpNoDelayString.toBoolean
+      } catch {
+         case n: NumberFormatException => {
+            throw new IllegalArgumentException("TCP no delay flag switch must be a boolean: " + tcpNoDelayString)
          }
+      }
 
       val sendBufSize = properties.getProperty(PROP_KEY_SEND_BUF_SIZE, SEND_BUF_SIZE_DEFAULT).toInt
       if (sendBufSize < 0) {
          throw new IllegalArgumentException("Send buffer size can't be lower than 0: " + sendBufSize)
       }
-      
+
       val recvBufSize = properties.getProperty(PROP_KEY_RECV_BUF_SIZE, RECV_BUF_SIZE_DEFAULT).toInt
       if (recvBufSize < 0) {
          throw new IllegalArgumentException("Send buffer size can't be lower than 0: " + sendBufSize)
@@ -61,7 +63,7 @@
       cacheManager.addListener(getRankCalculatorListener)
       // Start default cache
       startDefaultCache
-      val address =  new InetSocketAddress(host, port)
+      val address = new InetSocketAddress(host, port)
       startTransport(address, idleTimeout, tcpNoDelay, sendBufSize, recvBufSize)
    }
 
@@ -73,6 +75,19 @@
       transport.start
    }
 
+
+   def start(propertiesFileName: String, cacheManager: EmbeddedCacheManager) {
+      val propsObject = new Properties()
+      val stream = Util.loadResourceAsStream(propertiesFileName)
+      propsObject.load(stream)
+
+      if (propsObject.getProperty("isEnabled").equals("true")) {
+         start(propsObject, cacheManager)
+      }
+
+
+   }
+
    override def stop {
       if (transport != null)
          transport.stop