[jboss-cvs] JBossAS SVN: r66656 - in trunk: messaging/src/etc/deploy/clustered and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 1 11:37:28 EDT 2007
Author: clebert.suconic at jboss.com
Date: 2007-11-01 11:37:28 -0400 (Thu, 01 Nov 2007)
New Revision: 66656
Modified:
trunk/build/build-thirdparty.xml
trunk/messaging/src/etc/deploy/clustered/connection-factories-service.xml
trunk/messaging/src/etc/deploy/common/messaging-service.xml
trunk/messaging/src/etc/deploy/common/remoting-service.xml
trunk/messaging/src/etc/deploy/non-clustered/connection-factories-service.xml
Log:
JBAS-4689 - Update JBM to 1.4.0.SP1
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2007-11-01 15:25:42 UTC (rev 66655)
+++ trunk/build/build-thirdparty.xml 2007-11-01 15:37:28 UTC (rev 66656)
@@ -102,7 +102,7 @@
<componentref name="jboss/jbossws-native50" version="snapshot"/>
<componentref name="jboss/jbossxb" version="snapshot"/>
<componentref name="jboss/jms-integration-tests" version="1.0.1.GA"/>
- <componentref name="jboss/messaging" version="snapshot"/>
+ <componentref name="jboss/messaging" version="1.4.0.SP1-brew"/>
<componentref name="jboss/metadata" version="1.0.0.snapshot"/>
<componentref name="jboss/microcontainer" version="snapshot"/>
<componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
Modified: trunk/messaging/src/etc/deploy/clustered/connection-factories-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/clustered/connection-factories-service.xml 2007-11-01 15:25:42 UTC (rev 66655)
+++ trunk/messaging/src/etc/deploy/clustered/connection-factories-service.xml 2007-11-01 15:37:28 UTC (rev 66656)
@@ -115,7 +115,15 @@
<!- - The class name of the factory used to create the load balancing policy to use on the client side - ->
<attribute name="LoadBalancingFactory">org.jboss.jms.client.plugin.RoundRobinLoadBalancingFactory</attribute>
+
+ <!- - Whether we should be strict TCK compliant, i.e. how we deal with foreign messages, defaults to false- ->
+
+ <attribute name="StrictTck">false</attribute>
+ <!- - Disable JBoss Remoting Connector sanity checks - There is rarely a good reason to set this to true - ->
+
+ <attribute name="DisableRemotingChecks">false</attribute>
+
<!- - The connection factory will be bound in the following places in JNDI - ->
<attribute name="JNDIBindings">
Modified: trunk/messaging/src/etc/deploy/common/messaging-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/common/messaging-service.xml 2007-11-01 15:25:42 UTC (rev 66655)
+++ trunk/messaging/src/etc/deploy/common/messaging-service.xml 2007-11-01 15:37:28 UTC (rev 66656)
@@ -3,7 +3,7 @@
<!--
The JBoss Messaging service deployment descriptor.
- $Id: messaging-service.xml 64130 2007-07-18 23:21:27Z clebert.suconic at jboss.com $
+ $Id: messaging-service.xml 3204 2007-10-19 12:42:17Z timfox $
-->
<server>
@@ -87,7 +87,7 @@
<!-- Use XA when pulling persistent messages from a remote node to this one. -->
- <attribute name="UseXAForMessagePull">true</attribute>
+ <attribute name="UseXAForMessagePull">false</attribute>
<!-- When redistributing messages in the cluster. Do we need to preserve the order of messages received
by a particular consumer from a particular producer? -->
@@ -97,6 +97,11 @@
<!-- Max. time to hold previously delivered messages back waiting for clients to reconnect after failover -->
<attribute name="RecoverDeliveriesTimeout">300000</attribute>
+
+ <!-- The password used by the message sucker connections to create connections.
+ THIS SHOULD ALWAYS BE CHANGED AT INSTALL TIME TO SECURE SYSTEM
+ <attribute name="SuckerPassword"></attribute>
+ -->
<depends optional-attribute-name="PersistenceManager">jboss.messaging:service=PersistenceManager</depends>
Modified: trunk/messaging/src/etc/deploy/common/remoting-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/common/remoting-service.xml 2007-11-01 15:25:42 UTC (rev 66655)
+++ trunk/messaging/src/etc/deploy/common/remoting-service.xml 2007-11-01 15:37:28 UTC (rev 66656)
@@ -3,7 +3,7 @@
<!--
Standard bisocket-based Remoting service deployment descriptor.
- $Id: remoting-bisocket-service.xml 64130 2007-07-18 23:21:27Z clebert.suconic at jboss.com $
+ $Id: remoting-bisocket-service.xml 3237 2007-10-21 15:27:51Z timfox $
-->
<server>
@@ -17,6 +17,9 @@
<attribute name="Configuration">
<config>
<invoker transport="bisocket">
+
+ <!-- There should be no reason to change these parameters - warning!
+ Changing them may stop JBoss Messaging working correctly -->
<attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
<attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
<attribute name="dataType" isParam="true">jms</attribute>
@@ -24,12 +27,30 @@
<attribute name="timeout" isParam="true">0</attribute>
<attribute name="serverBindAddress">${jboss.bind.address}</attribute>
<attribute name="serverBindPort">4457</attribute>
- <attribute name="leasePeriod">10000</attribute>
<attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
- <attribute name="serverSocketClass" isParam="true">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
- <attribute name="numberOfRetries" isParam="true">1</attribute>
+ <attribute name="serverSocketClass">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
<attribute name="numberOfCallRetries" isParam="true">1</attribute>
- <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
+ <attribute name="pingFrequency" isParam="true">214748364</attribute>
+ <attribute name="pingWindowFactor" isParam="true">10</attribute>
+ <attribute name="onewayThreadPool">org.jboss.jms.server.remoting.DirectThreadPool</attribute>
+ <!-- End immutable parameters -->
+
+ <!-- Periodicity of client pings. Server window by default is twice this figure -->
+ <attribute name="clientLeasePeriod" isParam="true">10000</attribute>
+
+ <!-- Number of seconds to wait for a connection in the client pool to become free -->
+ <attribute name="numberOfRetries" isParam="true">10</attribute>
+
+ <!-- Max Number of connections in client pool. This should be significantly higher than
+ the max number of sessions/consumers you expect -->
+ <attribute name="clientMaxPoolSize" isParam="true">200</attribute>
+
+ <!-- Use these parameters to specify values for binding and connecting control connections to
+ work with your firewall/NAT configuration
+ <attribute name="secondaryBindPort">xyz</attribute>
+ <attribute name="secondaryConnectPort">abc</attribute>
+ -->
+
</invoker>
<handlers>
<handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
Modified: trunk/messaging/src/etc/deploy/non-clustered/connection-factories-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/non-clustered/connection-factories-service.xml 2007-11-01 15:25:42 UTC (rev 66655)
+++ trunk/messaging/src/etc/deploy/non-clustered/connection-factories-service.xml 2007-11-01 15:37:28 UTC (rev 66656)
@@ -3,7 +3,7 @@
<!--
Messaging Connection Factories deployment descriptor.
- $Id: connection-factories-service.xml 64130 2007-07-18 23:21:27Z clebert.suconic at jboss.com $
+ $Id: connection-factories-service.xml 3201 2007-10-19 10:39:50Z timfox $
-->
<server>
@@ -115,7 +115,15 @@
<!- - The class name of the factory used to create the load balancing policy to use on the client side - ->
<attribute name="LoadBalancingFactory">org.jboss.jms.client.plugin.RoundRobinLoadBalancingFactory</attribute>
+
+ <!- - Whether we should be strict TCK compliant, i.e. how we deal with foreign messages, defaults to false- ->
+
+ <attribute name="StrictTck">false</attribute>
+ <!- - Disable JBoss Remoting Connector sanity checks - There is rarely a good reason to set this to true - ->
+
+ <attribute name="DisableRemotingChecks">false</attribute>
+
<!- - The connection factory will be bound in the following places in JNDI - ->
<attribute name="JNDIBindings">
More information about the jboss-cvs-commits
mailing list