[jboss-cvs] JBoss Messaging SVN: r3665 - in trunk/src: main/org/jboss/messaging/core and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2008-02-04 09:58:45 -0500 (Mon, 04 Feb 2008)
New Revision: 3665

Modified:
   trunk/src/etc/server/default/deploy/jbm-configuration.xml
   trunk/src/main/org/jboss/messaging/core/Configuration.java
   trunk/src/main/org/jboss/messaging/core/FileConfiguration.java
Log:
* added remoting-disable-invm property to jbm-configuration.xml (defaults to false)

Modified: trunk/src/etc/server/default/deploy/jbm-configuration.xml
===================================================================
--- trunk/src/etc/server/default/deploy/jbm-configuration.xml	2008-02-04 14:32:10 UTC (rev 3664)
+++ trunk/src/etc/server/default/deploy/jbm-configuration.xml	2008-02-04 14:58:45 UTC (rev 3665)
@@ -60,6 +60,8 @@
       <remoting-bind-address>5400</remoting-bind-address>
       <!--  timeout in seconds -->
       <remoting-timeout>5</remoting-timeout>
+      <!-- true to disable invm communication when the client and the server are in the same JVM -->
+      <remoting-disable-invm>false</remoting-disable-invm>
 
    </configuration>
 

Modified: trunk/src/main/org/jboss/messaging/core/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/Configuration.java	2008-02-04 14:32:10 UTC (rev 3664)
+++ trunk/src/main/org/jboss/messaging/core/Configuration.java	2008-02-04 14:58:45 UTC (rev 3665)
@@ -23,21 +23,17 @@
 
 import static org.jboss.messaging.core.remoting.TransportType.TCP;
 
-import org.jboss.jms.server.security.Role;
-import org.jboss.messaging.core.remoting.RemotingConfiguration;
-import org.jboss.messaging.core.remoting.TransportType;
-import org.jboss.messaging.util.XMLUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.Serializable;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
+import org.jboss.jms.server.security.Role;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.TransportType;
+
 /**
  * This is the JBM configuration. It is used to configure the MessagingServer.
  * 
@@ -101,6 +97,8 @@
    
    protected Integer _remotingTimeout;
 
+   protected Boolean _remotingDisableInvm = false;
+
    public  void addPropertyChangeListener(
          PropertyChangeListener listener)
    {
@@ -343,6 +341,7 @@
    {
       RemotingConfiguration configuration = new RemotingConfiguration(_remotingTransport, "localhost", _remotingBindAddress);
       configuration.setTimeout(_remotingTimeout);
+      configuration.setInvmDisabled(_remotingDisableInvm);
       return configuration;
    }
 

Modified: trunk/src/main/org/jboss/messaging/core/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/FileConfiguration.java	2008-02-04 14:32:10 UTC (rev 3664)
+++ trunk/src/main/org/jboss/messaging/core/FileConfiguration.java	2008-02-04 14:58:45 UTC (rev 3665)
@@ -75,6 +75,7 @@
       _remotingTransport = TransportType.valueOf(getString(e, "remoting-transport", _remotingTransport.name()));
       _remotingBindAddress = getInteger(e, "remoting-bind-address", _remotingBindAddress);
       _remotingTimeout = getInteger(e, "remoting-timeout", _remotingTimeout);
+      _remotingDisableInvm = getBoolean(e, "remoting-disable-invm", _remotingDisableInvm);
       NodeList security = e.getElementsByTagName("default-security-config");
       if (security.getLength() > 0)
       {