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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Aug 29 05:43:27 EDT 2008


Author: timfox
Date: 2008-08-29 05:43:27 -0400 (Fri, 29 Aug 2008)
New Revision: 4894

Modified:
   trunk/src/config/jbm-configuration.xml
   trunk/src/config/jbm-jndi.xml
   trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
Log:
Some tweaks to config


Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml	2008-08-29 08:21:13 UTC (rev 4893)
+++ trunk/src/config/jbm-configuration.xml	2008-08-29 09:43:27 UTC (rev 4894)
@@ -18,6 +18,10 @@
       <!--  call timeout in milliseconds -->
       <call-timeout>30000</call-timeout>
       
+      <packet-confirmation-batch-size>1000</packet-confirmation-batch-size>
+      
+      <connection-scan-period>1000</connection-scan-period>
+      
       <!-- Example interceptors 
       <remoting-interceptors>
          <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
@@ -26,12 +30,14 @@
       -->
       
       <remoting-acceptors>
+         <!-- In VM acceptor -->
          <acceptor>
             <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
             <params>
 	            <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
             </params>            
          </acceptor>
+         <!-- Netty standard TCP acceptor -->
          <acceptor>
             <factory-class>org.jboss.messaging.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
             <params>	            	            
@@ -41,25 +47,35 @@
 	            <param key="jbm.remoting.netty.tcpsendbuffersize" value="32768" type="Integer"/>
 	            <param key="jbm.remoting.netty.tcpreceivebuffersize" value="32768" type="Integer"/>	            
 	            <param key="jbm.remoting.netty.sslenabled" value="false" type="Boolean"/>
+            </params>
+         </acceptor>   
+         <!-- Netty SSL Acceptor
+         <acceptor>
+            <factory-class>org.jboss.messaging.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+            <params>	            	            
+	            <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+	            <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>	            
+	            <param key="jbm.remoting.netty.tcpnodelay" value="true" type="Boolean"/>
+	            <param key="jbm.remoting.netty.tcpsendbuffersize" value="32768" type="Integer"/>
+	            <param key="jbm.remoting.netty.tcpreceivebuffersize" value="32768" type="Integer"/>	            
+	            <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
 	            <param key="jbm.remoting.netty.keystorepath" value="messaging.keystore" type="String"/>
 	            <param key="jbm.remoting.netty.keystorepassword" value="secureexample" type="String"/>
 	            <param key="jbm.remoting.netty.truststorepath" value="messaging.truststore" type="String"/>
 	            <param key="jbm.remoting.netty.truststorepassword" value="secureexample" type="String"/>
             </params>
-         </acceptor>         
+         </acceptor> 
+         -->      
+         <!-- Mina Acceptor -->
          <acceptor>
             <factory-class>org.jboss.messaging.core.remoting.impl.mina.MinaAcceptorFactory</factory-class>
             <params>	            	            
 	            <param key="jbm.remoting.mina.host" value="localhost" type="String"/>
-	            <param key="jbm.remoting.mina.port" value="5500" type="Integer"/>	            
+	            <param key="jbm.remoting.mina.port" value="5600" type="Integer"/>	            
 	            <param key="jbm.remoting.mina.tcpnodelay" value="true" type="Boolean"/>
 	            <param key="jbm.remoting.mina.tcpsendbuffersize" value="32768" type="Integer"/>
 	            <param key="jbm.remoting.mina.tcpreceivebuffersize" value="32768" type="Integer"/>	            
 	            <param key="jbm.remoting.mina.sslenabled" value="false" type="Boolean"/>
-	            <param key="jbm.remoting.mina.keystorepath" value="messaging.keystore" type="String"/>
-	            <param key="jbm.remoting.mina.keystorepassword" value="secureexample" type="String"/>
-	            <param key="jbm.remoting.mina.truststorepath" value="messaging.truststore" type="String"/>
-	            <param key="jbm.remoting.mina.truststorepassword" value="secureexample" type="String"/>
             </params>
          </acceptor>
       </remoting-acceptors>

Modified: trunk/src/config/jbm-jndi.xml
===================================================================
--- trunk/src/config/jbm-jndi.xml	2008-08-29 08:21:13 UTC (rev 4893)
+++ trunk/src/config/jbm-jndi.xml	2008-08-29 09:43:27 UTC (rev 4894)
@@ -33,7 +33,12 @@
    <connection-factory name="MyExampleConnectionFactory">
       <connector>
          <factory-class>org.jboss.messaging.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <params>
+            <param key="jbm.remoting.netty.tcpnodelay" value="true" type="Boolean"/>
+         </params>
       </connector>
+      <ping-period>5000</ping-period>
+      <call-timeout>30000</call-timeout>
       <entry name="/MyExampleConnectionFactory"/>
       <entry name="/acme/MyExampleConnectionFactoryDupe"/>
       <entry name="java:/xyz/CF1"/>
@@ -56,8 +61,31 @@
       <send-np-messages-synchronously>true</send-np-messages-synchronously>
       <!--Whether we send persistent messages synchronously-->
       <send-p-messages-synchronously>true</send-p-messages-synchronously>
-
    </connection-factory>
+   
+   <connection-factory name="TestInVMConnectionFactory">
+      <connector>
+         <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+         <params>
+            <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+         </params>
+      </connector>
+      <entry name="/TestInVMConnectionFactory"/>
+   </connection-factory>
+   
+   <connection-factory name="TestSSLConnectionFactory">
+      <connector>
+         <factory-class>org.jboss.messaging.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <params>
+            <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+            <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>	                       
+            <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+            <param key="jbm.remoting.netty.keystorepath" value="messaging.keystore" type="String"/>
+            <param key="jbm.remoting.netty.keystorepassword" value="secureexample" type="String"/>
+         </params>
+      </connector>      
+      <entry name="/TestSSLConnectionFactory"/>      
+   </connection-factory>
 
    <queue name="MyQueue">
       <entry name="MyQueue"/>

Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java	2008-08-29 08:21:13 UTC (rev 4893)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java	2008-08-29 09:43:27 UTC (rev 4894)
@@ -57,7 +57,7 @@
      
    public static final int DEFAULT_CALL_TIMEOUT = 30000;
    
-   public static final int DEFAULT_PACKET_CONFIRMATION_BATCH_SIZE = 100;
+   public static final int DEFAULT_PACKET_CONFIRMATION_BATCH_SIZE = 1000;
    
    public static final long DEFAULT_CONNECTION_SCAN_PERIOD = 1000;
    




More information about the jboss-cvs-commits mailing list