[hornetq-commits] JBoss hornetq SVN: r10408 - in trunk: src/main/org/hornetq/core/settings/impl and 1 other directory.

Author: clebert.suconic(a)jboss.com Date: 2011-03-29 07:54:45 -0400 (Tue, 29 Mar 2011) New Revision: 10408 Modified: trunk/docs/eap-manual/en/clusters.xml trunk/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java Log: Removing mistakenly added log Modified: trunk/docs/eap-manual/en/clusters.xml =================================================================== --- trunk/docs/eap-manual/en/clusters.xml 2011-03-29 11:52:33 UTC (rev 10407) +++ trunk/docs/eap-manual/en/clusters.xml 2011-03-29 11:54:45 UTC (rev 10408) @@ -284,101 +284,104 @@ and configure it like so: </para> <programlisting> - &lt;configuration xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + &lt;configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> - &lt;jmx-domain>org.hornetq.backup1&lt;/jmx-domain> + &lt;jmx-domain>org.hornetq.backup1&lt;/jmx-domain> - &lt;clustered>true&lt;/clustered> + &lt;clustered>true&lt;/clustered> - &lt;backup>true&lt;/backup> + &lt;backup>true&lt;/backup> - &lt;shared-store>true&lt;/shared-store> + &lt;shared-store>true&lt;/shared-store> - &lt;allow-failback>true&lt;/allow-failback> + &lt;allow-failback>true&lt;/allow-failback> - &lt;log-delegate-factory-class-name>org.hornetq.integration.logging.Log4jLogDelegateFactory&lt;/log-delegate-factory-class-name> + &lt;log-delegate-factory-class-name>org.hornetq.integration.logging.Log4jLogDelegateFactory&lt;/log-delegate-factory-class-name> - &lt;bindings-directory>/media/shared/data/hornetq-backup/bindings&lt;/bindings-directory> + &lt;bindings-directory>/media/shared/data/hornetq-backup/bindings&lt;/bindings-directory> - &lt;journal-directory>/media/shared/data/hornetq-backup/journal&lt;/journal-directory> + &lt;journal-directory>/media/shared/data/hornetq-backup/journal&lt;/journal-directory> - &lt;journal-min-files>10&lt;/journal-min-files> + &lt;journal-min-files>10&lt;/journal-min-files> - &lt;large-messages-directory>/media/shared/data/hornetq-backup/largemessages&lt;/large-messages-directory> + &lt;large-messages-directory>/media/shared/data/hornetq-backup/largemessages&lt;/large-messages-directory> - &lt;paging-directory>/media/shared/data/hornetq-backup/paging&lt;/paging-directory> + &lt;paging-directory>/media/shared/data/hornetq-backup/paging&lt;/paging-directory> - &lt;connectors> - &lt;connector name="netty-connector"> - &lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class> - &lt;param key="host" value="${jboss.bind.address:localhost}"/> - &lt;param key="port" value="${hornetq.remoting.backup.netty.port:5446}"/> - &lt;/connector> + &lt;connectors> + &lt;connector name="netty-connector"> + &lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class> + &lt;param key="host" value="${jboss.bind.address:localhost}"/> + &lt;param key="port" value="${hornetq.remoting.backup.netty.port:5446}"/> + &lt;/connector> - &lt;connector name="in-vm"> - &lt;factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory&lt;/factory-class> - &lt;param key="server-id" value="${hornetq.server-id:0}"/> - &lt;/connector> + &lt;connector name="in-vm"> + &lt;factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory&lt;/factory-class> + &lt;param key="server-id" value="${hornetq.server-id:0}"/> + &lt;/connector> - &lt;/connectors> + &lt;/connectors> - &lt;acceptors> - &lt;acceptor name="netty"> - &lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class> - &lt;param key="host" value="${jboss.bind.address:localhost}"/> - &lt;param key="port" value="${hornetq.remoting.backup.netty.port:5446}"/> - &lt;/acceptor> - &lt;/acceptors> + &lt;acceptors> + &lt;acceptor name="netty"> + &lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class> + &lt;param key="host" value="${jboss.bind.address:localhost}"/> + &lt;param key="port" value="${hornetq.remoting.backup.netty.port:5446}"/> + &lt;/acceptor> + &lt;/acceptors> - &lt;broadcast-groups> - &lt;broadcast-group name="bg-group1"> - &lt;group-address>231.7.7.7&lt;/group-address> - &lt;group-port>9876&lt;/group-port> - &lt;broadcast-period>1000&lt;/broadcast-period> - &lt;connector-ref>netty-connector&lt;/connector-ref> - &lt;/broadcast-group> - &lt;/broadcast-groups> + &lt;broadcast-groups> + &lt;broadcast-group name="bg-group1"> + &lt;group-address>231.7.7.7&lt;/group-address> + &lt;group-port>9876&lt;/group-port> + &lt;broadcast-period>1000&lt;/broadcast-period> + &lt;connector-ref>netty-connector&lt;/connector-ref> + &lt;/broadcast-group> + &lt;/broadcast-groups> - &lt;discovery-groups> - &lt;discovery-group name="dg-group1"> - &lt;group-address>231.7.7.7&lt;/group-address> - &lt;group-port>9876&lt;/group-port> - &lt;refresh-timeout>60000&lt;/refresh-timeout> - &lt;/discovery-group> - &lt;/discovery-groups> + &lt;discovery-groups> + &lt;discovery-group name="dg-group1"> + &lt;group-address>231.7.7.7&lt;/group-address> + &lt;group-port>9876&lt;/group-port> + &lt;refresh-timeout>60000&lt;/refresh-timeout> + &lt;/discovery-group> + &lt;/discovery-groups> - &lt;cluster-connections> - &lt;cluster-connection name="my-cluster"> - &lt;address>jms&lt;/address> - &lt;connector-ref>netty-connector&lt;/connector-ref> - &lt;discovery-group-ref discovery-group-name="dg-group1"/> - &lt;/cluster-connection> - &lt;/cluster-connections> + &lt;cluster-connections> + &lt;cluster-connection name="my-cluster"> + &lt;address>jms&lt;/address> + &lt;connector-ref>netty-connector&lt;/connector-ref> + &lt;discovery-group-ref discovery-group-name="dg-group1"/> + &lt;!--max hops defines how messages are redistributed, the default is 1 meaning only distribute to directly + connected nodes, to disable set to 0--> + &lt;!--&lt;max-hops>0&lt;/max-hops>--> + &lt;/cluster-connection> + &lt;/cluster-connections> - &lt;security-settings> - &lt;security-setting match="#"> - &lt;permission type="createNonDurableQueue" roles="guest"/> - &lt;permission type="deleteNonDurableQueue" roles="guest"/> - &lt;permission type="consume" roles="guest"/> - &lt;permission type="send" roles="guest"/> - &lt;/security-setting> - &lt;/security-settings> + &lt;security-settings> + &lt;security-setting match="#"> + &lt;permission type="createNonDurableQueue" roles="guest"/> + &lt;permission type="deleteNonDurableQueue" roles="guest"/> + &lt;permission type="consume" roles="guest"/> + &lt;permission type="send" roles="guest"/> + &lt;/security-setting> + &lt;/security-settings> - &lt;address-settings> - &lt;!--default for catch all--> - &lt;address-setting match="#"> - &lt;dead-letter-address>jms.queue.DLQ&lt;/dead-letter-address> - &lt;expiry-address>jms.queue.ExpiryQueue&lt;/expiry-address> - &lt;redelivery-delay>0&lt;/redelivery-delay> - &lt;max-size-bytes>10485760&lt;/max-size-bytes> - &lt;message-counter-history-day-limit>10&lt;/message-counter-history-day-limit> - &lt;address-full-policy>BLOCK&lt;/address-full-policy> - &lt;/address-setting> - &lt;/address-settings> + &lt;address-settings> + &lt;!--default for catch all--> + &lt;address-setting match="#"> + &lt;dead-letter-address>jms.queue.DLQ&lt;/dead-letter-address> + &lt;expiry-address>jms.queue.ExpiryQueue&lt;/expiry-address> + &lt;redelivery-delay>0&lt;/redelivery-delay> + &lt;max-size-bytes>10485760&lt;/max-size-bytes> + &lt;message-counter-history-day-limit>10&lt;/message-counter-history-day-limit> + &lt;address-full-policy>BLOCK&lt;/address-full-policy> + &lt;/address-setting> + &lt;/address-settings> - &lt;/configuration> + &lt;/configuration> </programlisting> <para> Modified: trunk/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java =================================================================== --- trunk/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java 2011-03-29 11:52:33 UTC (rev 10407) +++ trunk/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java 2011-03-29 11:54:45 UTC (rev 10408) @@ -180,7 +180,6 @@ */ public void removeMatch(final String match) { - new Exception("Removing match " + match).printStackTrace(); boolean isImmutable = immutables.contains(match); if (isImmutable) {