[jboss-cvs] JBoss Messaging SVN: r7338 - in trunk/src/config/trunk: non-clustered and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 15 09:36:58 EDT 2009
Author: timfox
Date: 2009-06-15 09:36:58 -0400 (Mon, 15 Jun 2009)
New Revision: 7338
Modified:
trunk/src/config/trunk/clustered/jbm-configuration.xml
trunk/src/config/trunk/clustered/jbm-jms.xml
trunk/src/config/trunk/non-clustered/jbm-configuration.xml
trunk/src/config/trunk/non-clustered/jbm-jms.xml
Log:
fixed trunk config
Modified: trunk/src/config/trunk/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/trunk/clustered/jbm-configuration.xml 2009-06-15 13:27:11 UTC (rev 7337)
+++ trunk/src/config/trunk/clustered/jbm-configuration.xml 2009-06-15 13:36:58 UTC (rev 7338)
@@ -1,81 +1,70 @@
<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
-
- <clustered>true</clustered>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-backup">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6400" type="Integer"/>
- </connector>
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
- </connector>
- <connector name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <!-- In VM acceptor -->
- <acceptor name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
- </acceptor>
- <!-- Netty standard TCP acceptor -->
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <local-bind-port>1234</local-bind-port>
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>5000</broadcast-period>
- <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <security-settings>
- <security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
-
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
+
+ <clustered>true</clustered>
+
+ <connectors>
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>5000</broadcast-period>
+ <connector-ref connector-name="netty"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
+ </address-settings>
+
</configuration>
Modified: trunk/src/config/trunk/clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/trunk/clustered/jbm-jms.xml 2009-06-15 13:27:11 UTC (rev 7337)
+++ trunk/src/config/trunk/clustered/jbm-jms.xml 2009-06-15 13:36:58 UTC (rev 7338)
@@ -1,30 +1,28 @@
<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
-
- <connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entries>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="ClusteredConnectionFactory">
- <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
- <entries>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <queue name="DLQ">
- <entry name="/queue/DLQ"/>
- </queue>
- <queue name="ExpiryQueue">
- <entry name="/queue/ExpiryQueue"/>
- </queue>
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="DLQ">
+ <entry name="/queue/DLQ"/>
+ </queue>
+ <queue name="ExpiryQueue">
+ <entry name="/queue/ExpiryQueue"/>
+ </queue>
+ <queue name="ExampleQueue">
+ <entry name="/queue/ExampleQueue"/>
+ </queue>
+ <topic name="ExampleTopic">
+ <entry name="/topic/ExampleTopic"/>
+ </topic>
+
</configuration>
\ No newline at end of file
Modified: trunk/src/config/trunk/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/trunk/non-clustered/jbm-configuration.xml 2009-06-15 13:27:11 UTC (rev 7337)
+++ trunk/src/config/trunk/non-clustered/jbm-configuration.xml 2009-06-15 13:36:58 UTC (rev 7338)
@@ -1,59 +1,44 @@
<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
- </connector>
-
- <connector name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
-
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <!-- In VM acceptor -->
- <acceptor name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
- </acceptor>
-
- <!-- Netty TCP Acceptor -->
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <security-settings>
- <security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
-
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
-
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
+
+ <connectors>
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
+ </address-settings>
+
</configuration>
Modified: trunk/src/config/trunk/non-clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/trunk/non-clustered/jbm-jms.xml 2009-06-15 13:27:11 UTC (rev 7337)
+++ trunk/src/config/trunk/non-clustered/jbm-jms.xml 2009-06-15 13:36:58 UTC (rev 7338)
@@ -1,21 +1,28 @@
<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
-
- <connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entries>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <queue name="DLQ">
- <entry name="/queue/DLQ"/>
- </queue>
-
- <queue name="ExpiryQueue">
- <entry name="/queue/ExpiryQueue"/>
- </queue>
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="DLQ">
+ <entry name="/queue/DLQ"/>
+ </queue>
+ <queue name="ExpiryQueue">
+ <entry name="/queue/ExpiryQueue"/>
+ </queue>
+ <queue name="ExampleQueue">
+ <entry name="/queue/ExampleQueue"/>
+ </queue>
+ <topic name="ExampleTopic">
+ <entry name="/topic/ExampleTopic"/>
+ </topic>
+
</configuration>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list