Author: clebert.suconic(a)jboss.com Date: 2010-11-10 20:11:10 -0500 (Wed, 10 Nov 2010) New Revision: 9869 Modified: trunk/src/config/jboss-as-4/clustered/hornetq-jms.xml trunk/src/config/jboss-as-4/non-clustered/hornetq-jms.xml trunk/src/config/jboss-as-5/clustered/hornetq-jms.xml trunk/src/config/jboss-as-5/non-clustered/hornetq-jms.xml trunk/src/config/stand-alone/clustered/hornetq-jms.xml trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml Log: tweaks on configs Modified: trunk/src/config/jboss-as-4/clustered/hornetq-jms.xml =================================================================== --- trunk/src/config/jboss-as-4/clustered/hornetq-jms.xml 2010-11-11 01:10:29 UTC (rev 9868) +++ trunk/src/config/jboss-as-4/clustered/hornetq-jms.xml 2010-11-11 01:11:10 UTC (rev 9869) @@ -3,38 +3,65 @@ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <connection-factory name="NettyConnectionFactory"> - <xa>true<xa> + <xa>true</xa> <connectors> <connector-ref connector-name="netty"/> </connectors> <entries> - <entry name="/ConnectionFactory"/> <entry name="/XAConnectionFactory"/> </entries> </connection-factory> + <connection-factory name="NettyConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/ConnectionFactory"/> + </entries> + </connection-factory> + <connection-factory name="NettyThroughputConnectionFactory"> <xa>true</xa> <connectors> <connector-ref connector-name="netty-throughput"/> </connectors> <entries> - <entry name="/ThroughputConnectionFactory"/> <entry name="/XAThroughputConnectionFactory"/> </entries> </connection-factory> + <connection-factory name="NettyThroughputConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty-throughput"/> + </connectors> + <entries> + <entry name="/ThroughputConnectionFactory"/> + </entries> + </connection-factory> + <connection-factory name="InVMConnectionFactory"> <xa>true</xa> <connectors> <connector-ref connector-name="in-vm"/> </connectors> <entries> - <entry name="java:/ConnectionFactory"/> <entry name="java:/XAConnectionFactory"/> </entries> </connection-factory> + <connection-factory name="InVMConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="in-vm"/> + </connectors> + <entries> + <entry name="java:/ConnectionFactory"/> + </entries> + </connection-factory> + <queue name="DLQ"> <entry name="/queue/DLQ"/> </queue> Modified: trunk/src/config/jboss-as-4/non-clustered/hornetq-jms.xml =================================================================== --- trunk/src/config/jboss-as-4/non-clustered/hornetq-jms.xml 2010-11-11 01:10:29 UTC (rev 9868) +++ trunk/src/config/jboss-as-4/non-clustered/hornetq-jms.xml 2010-11-11 01:11:10 UTC (rev 9869) @@ -8,33 +8,60 @@ <connector-ref connector-name="netty"/> </connectors> <entries> - <entry name="/ConnectionFactory"/> <entry name="/XAConnectionFactory"/> </entries> </connection-factory> + <connection-factory name="NettyConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/ConnectionFactory"/> + </entries> + </connection-factory> + <connection-factory name="NettyThroughputConnectionFactory"> <xa>true</xa> - <connectors> + <connectors> <connector-ref connector-name="netty-throughput"/> - </connectors> - <entries> - <entry name="/ThroughputConnectionFactory"/> - <entry name="/XAThroughputConnectionFactory"/> - </entries> - </connection-factory> + </connectors> + <entries> + <entry name="/XAThroughputConnectionFactory"/> + </entries> + </connection-factory> + <connection-factory name="NettyThroughputConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty-throughput"/> + </connectors> + <entries> + <entry name="/ThroughputConnectionFactory"/> + </entries> + </connection-factory> + <connection-factory name="InVMConnectionFactory"> <xa>true</xa> <connectors> <connector-ref connector-name="in-vm"/> </connectors> <entries> - <entry name="java:/ConnectionFactory"/> <entry name="java:/XAConnectionFactory"/> </entries> </connection-factory> - + + <connection-factory name="InVMConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="in-vm"/> + </connectors> + <entries> + <entry name="java:/ConnectionFactory"/> + </entries> + </connection-factory> + <queue name="DLQ"> <entry name="/queue/DLQ"/> </queue> Modified: trunk/src/config/jboss-as-5/clustered/hornetq-jms.xml =================================================================== --- trunk/src/config/jboss-as-5/clustered/hornetq-jms.xml 2010-11-11 01:10:29 UTC (rev 9868) +++ trunk/src/config/jboss-as-5/clustered/hornetq-jms.xml 2010-11-11 01:11:10 UTC (rev 9869) @@ -8,33 +8,60 @@ <connector-ref connector-name="netty"/> </connectors> <entries> - <entry name="/ConnectionFactory"/> <entry name="/XAConnectionFactory"/> </entries> </connection-factory> + <connection-factory name="NettyConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/ConnectionFactory"/> + </entries> + </connection-factory> + <connection-factory name="NettyThroughputConnectionFactory"> <xa>true</xa> <connectors> <connector-ref connector-name="netty-throughput"/> </connectors> <entries> - <entry name="/ThroughputConnectionFactory"/> <entry name="/XAThroughputConnectionFactory"/> </entries> </connection-factory> + <connection-factory name="NettyThroughputConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty-throughput"/> + </connectors> + <entries> + <entry name="/ThroughputConnectionFactory"/> + </entries> + </connection-factory> + <connection-factory name="InVMConnectionFactory"> <xa>true</xa> <connectors> <connector-ref connector-name="in-vm"/> </connectors> <entries> - <entry name="java:/ConnectionFactory"/> <entry name="java:/XAConnectionFactory"/> </entries> </connection-factory> + <connection-factory name="InVMConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="in-vm"/> + </connectors> + <entries> + <entry name="java:/ConnectionFactory"/> + </entries> + </connection-factory> + <queue name="DLQ"> <entry name="/queue/DLQ"/> </queue> Modified: trunk/src/config/jboss-as-5/non-clustered/hornetq-jms.xml =================================================================== --- trunk/src/config/jboss-as-5/non-clustered/hornetq-jms.xml 2010-11-11 01:10:29 UTC (rev 9868) +++ trunk/src/config/jboss-as-5/non-clustered/hornetq-jms.xml 2010-11-11 01:11:10 UTC (rev 9869) @@ -8,33 +8,60 @@ <connector-ref connector-name="netty"/> </connectors> <entries> - <entry name="/ConnectionFactory"/> <entry name="/XAConnectionFactory"/> </entries> </connection-factory> + <connection-factory name="NettyConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/ConnectionFactory"/> + </entries> + </connection-factory> + <connection-factory name="NettyThroughputConnectionFactory"> <xa>true</xa> - <connectors> + <connectors> <connector-ref connector-name="netty-throughput"/> - </connectors> - <entries> - <entry name="/ThroughputConnectionFactory"/> - <entry name="/XAThroughputConnectionFactory"/> - </entries> - </connection-factory> + </connectors> + <entries> + <entry name="/XAThroughputConnectionFactory"/> + </entries> + </connection-factory> + <connection-factory name="NettyThroughputConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty-throughput"/> + </connectors> + <entries> + <entry name="/ThroughputConnectionFactory"/> + </entries> + </connection-factory> + <connection-factory name="InVMConnectionFactory"> <xa>true</xa> <connectors> <connector-ref connector-name="in-vm"/> </connectors> <entries> - <entry name="java:/ConnectionFactory"/> <entry name="java:/XAConnectionFactory"/> </entries> </connection-factory> - + + <connection-factory name="InVMConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="in-vm"/> + </connectors> + <entries> + <entry name="java:/ConnectionFactory"/> + </entries> + </connection-factory> + <queue name="DLQ"> <entry name="/queue/DLQ"/> </queue> Modified: trunk/src/config/stand-alone/clustered/hornetq-jms.xml =================================================================== --- trunk/src/config/stand-alone/clustered/hornetq-jms.xml 2010-11-11 01:10:29 UTC (rev 9868) +++ trunk/src/config/stand-alone/clustered/hornetq-jms.xml 2010-11-11 01:11:10 UTC (rev 9869) @@ -1,38 +1,53 @@ <configuration xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> - - <connection-factory name="NettyConnectionFactory"> - <connectors> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> + + <connection-factory name="NettyConnectionFactory"> + <xa>true</xa> + <connectors> <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/ConnectionFactory"/> - <entry name="/XAConnectionFactory"/> - </entries> - </connection-factory> - - <connection-factory name="NettyThroughputConnectionFactory"> - <connectors> + </connectors> + <entries> + <entry name="/XAConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="NettyConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/ConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="NettyThroughputConnectionFactory"> + <xa>true</xa> + <connectors> <connector-ref connector-name="netty-throughput"/> - </connectors> - <entries> - <entry name="/ThroughputConnectionFactory"/> - <entry name="/XAThroughputConnectionFactory"/> - </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 + </connectors> + <entries> + <entry name="/XAThroughputConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="NettyThroughputConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty-throughput"/> + </connectors> + <entries> + <entry name="/ThroughputConnectionFactory"/> + </entries> + </connection-factory> + + <queue name="DLQ"> + <entry name="/queue/DLQ"/> + </queue> + + <queue name="ExpiryQueue"> + <entry name="/queue/ExpiryQueue"/> + </queue> + +</configuration> Modified: trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml =================================================================== --- trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml 2010-11-11 01:10:29 UTC (rev 9868) +++ trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml 2010-11-11 01:11:10 UTC (rev 9869) @@ -1,38 +1,53 @@ <configuration xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> - - <connection-factory name="NettyConnectionFactory"> - <connectors> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> + + <connection-factory name="NettyConnectionFactory"> + <xa>true</xa> + <connectors> <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/ConnectionFactory"/> - <entry name="/XAConnectionFactory"/> - </entries> - </connection-factory> - - <connection-factory name="NettyThroughputConnectionFactory"> - <connectors> + </connectors> + <entries> + <entry name="/XAConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="NettyConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/ConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="NettyThroughputConnectionFactory"> + <xa>true</xa> + <connectors> <connector-ref connector-name="netty-throughput"/> - </connectors> - <entries> - <entry name="/ThroughputConnectionFactory"/> - <entry name="/XAThroughputConnectionFactory"/> - </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 + </connectors> + <entries> + <entry name="/XAThroughputConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="NettyThroughputConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty-throughput"/> + </connectors> + <entries> + <entry name="/ThroughputConnectionFactory"/> + </entries> + </connection-factory> + + <queue name="DLQ"> + <entry name="/queue/DLQ"/> + </queue> + + <queue name="ExpiryQueue"> + <entry name="/queue/ExpiryQueue"/> + </queue> + +</configuration>