[hornetq-commits] JBoss hornetq SVN: r9170 - in trunk: src/config and 3 other directories.

Author: ataylor Date: 2010-04-26 12:25:35 -0400 (Mon, 26 Apr 2010) New Revision: 9170 Added: trunk/src/config/jboss-as-6/ trunk/src/config/jboss-as-6/clustered/ trunk/src/config/jboss-as-6/clustered/hornetq-configuration.xml trunk/src/config/jboss-as-6/clustered/hornetq-jboss-beans.xml trunk/src/config/jboss-as-6/clustered/hornetq-jms.xml trunk/src/config/jboss-as-6/clustered/jms-ds.xml trunk/src/config/jboss-as-6/non-clustered/ trunk/src/config/jboss-as-6/non-clustered/hornetq-configuration.xml trunk/src/config/jboss-as-6/non-clustered/hornetq-jboss-beans.xml trunk/src/config/jboss-as-6/non-clustered/hornetq-jms.xml trunk/src/config/jboss-as-6/non-clustered/jms-ds.xml Modified: trunk/build-hornetq.xml Log: added JBoss AS 6 resources Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2010-04-26 15:46:28 UTC (rev 9169) +++ trunk/build-hornetq.xml 2010-04-26 16:25:35 UTC (rev 9170) @@ -888,7 +888,9 @@ <exclude name="**/data"/> </fileset> <fileset dir="${src.config.dir}"> - <include name="jboss-as/**"/> + <include name="jboss-as-4/**"/> + <include name="jboss-as-5/**"/> + <include name="jboss-as-6/**"/> <include name="ra.xml"/> <exclude name="**/build.xml"/> </fileset> Added: trunk/src/config/jboss-as-6/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/jboss-as-6/clustered/hornetq-configuration.xml (rev 0) +++ trunk/src/config/jboss-as-6/clustered/hornetq-configuration.xml 2010-04-26 16:25:35 UTC (rev 9170) @@ -0,0 +1,119 @@ +<!-- + ~ Copyright 2009 Red Hat, Inc. + ~ Red Hat licenses this file to you under the Apache License, version + ~ 2.0 (the "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + ~ implied. See the License for the specific language governing + ~ permissions and limitations under the License. + --> + +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + + <clustered>true</clustered> + + <log-delegate-factory-class-name>org.hornetq.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name> + + <bindings-directory>${jboss.server.data.dir}/hornetq/bindings</bindings-directory> + + <journal-directory>${jboss.server.data.dir}/hornetq/journal</journal-directory> + + <journal-min-files>10</journal-min-files> + + <large-messages-directory>${jboss.server.data.dir}/hornetq/largemessages</large-messages-directory> + + <paging-directory>${jboss.server.data.dir}/hornetq/paging</paging-directory> + + <connectors> + <connector name="netty"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + </connector> + + <connector name="netty-throughput"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="batch-delay" value="50"/> + </connector> + + <connector name="in-vm"> + <factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class> + <param key="server-id" value="${hornetq.server-id:0}"/> + </connector> + + </connectors> + + <acceptors> + <acceptor name="netty"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + </acceptor> + + <acceptor name="netty-throughput"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="batch-delay" value="50"/> + </acceptor> + + <acceptor name="in-vm"> + <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> + <param key="server-id" value="0"/> + </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="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" 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="#"> + <dead-letter-address>jms.queue.DLQ</dead-letter-address> + <expiry-address>jms.queue.ExpiryQueue</expiry-address> + <redelivery-delay>0</redelivery-delay> + <max-size-bytes>10485760</max-size-bytes> + <message-counter-history-day-limit>10</message-counter-history-day-limit> + <address-full-policy>BLOCK</address-full-policy> + </address-setting> + </address-settings> + +</configuration> Added: trunk/src/config/jboss-as-6/clustered/hornetq-jboss-beans.xml =================================================================== --- trunk/src/config/jboss-as-6/clustered/hornetq-jboss-beans.xml (rev 0) +++ trunk/src/config/jboss-as-6/clustered/hornetq-jboss-beans.xml 2010-04-26 16:25:35 UTC (rev 9170) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- MBean server --> + <bean name="MBeanServer" class="javax.management.MBeanServer"> + <constructor factoryClass="org.jboss.mx.util.MBeanServerLocator" + factoryMethod="locateJBoss"/> + </bean> + + <!-- The core configuration --> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> + <property name="configurationUrl">${jboss.server.home.url}/deploy/hornetq/hornetq-configuration.xml</property> + </bean> + + <!-- The security manager --> + <bean name="HornetQSecurityManager" class="org.hornetq.integration.jboss.security.JBossASSecurityManager"> + <start ignored="true"/> + <stop ignored="true"/> + <depends>JBossSecurityJNDIContextEstablishment</depends> + </bean> + + <!-- The core server --> + <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl"> + <constructor> + <parameter> + <inject bean="Configuration"/> + </parameter> + <parameter> + <inject bean="MBeanServer"/> + </parameter> + <parameter> + <inject bean="HornetQSecurityManager"/> + </parameter> + </constructor> + <start ignored="true"/> + <stop ignored="true"/> + </bean> + + <!-- The JMS server --> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> + <constructor> + <parameter> + <inject bean="HornetQServer"/> + </parameter> + </constructor> + </bean> + +</deployment> Added: trunk/src/config/jboss-as-6/clustered/hornetq-jms.xml =================================================================== --- trunk/src/config/jboss-as-6/clustered/hornetq-jms.xml (rev 0) +++ trunk/src/config/jboss-as-6/clustered/hornetq-jms.xml 2010-04-26 16:25:35 UTC (rev 9170) @@ -0,0 +1,43 @@ +<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> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/ConnectionFactory"/> + <entry name="/XAConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="NettyThroughputConnectionFactory"> + <connectors> + <connector-ref connector-name="netty-throughput"/> + </connectors> + <entries> + <entry name="/ThroughputConnectionFactory"/> + <entry name="/XAThroughputConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="InVMConnectionFactory"> + <connectors> + <connector-ref connector-name="in-vm"/> + </connectors> + <entries> + <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> + +</configuration> \ No newline at end of file Added: trunk/src/config/jboss-as-6/clustered/jms-ds.xml =================================================================== --- trunk/src/config/jboss-as-6/clustered/jms-ds.xml (rev 0) +++ trunk/src/config/jboss-as-6/clustered/jms-ds.xml 2010-04-26 16:25:35 UTC (rev 9170) @@ -0,0 +1,26 @@ +<connection-factories> + <!-- + JMS Stuff + --> + + <mbean code="org.jboss.jms.jndi.JMSProviderLoader" name="hornetq:service=JMSProviderLoader,name=JMSProvider"> + <attribute name="ProviderName">DefaultJMSProvider</attribute> + <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute> + <attribute name="FactoryRef">java:/XAConnectionFactory</attribute> + <attribute name="QueueFactoryRef">java:/XAConnectionFactory</attribute> + <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute> + </mbean> + <!-- + JMS XA Resource adapter, use this to get transacted JMS in beans + --> + <tx-connection-factory> + <jndi-name>JmsXA</jndi-name> + <xa-transaction/> + <rar-name>jms-ra.rar</rar-name> + <connection-definition>org.hornetq.ra.HornetQRAConnectionFactory</connection-definition> + <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property> + <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property> + <max-pool-size>20</max-pool-size> + <security-domain-and-application>JmsXARealm</security-domain-and-application> + </tx-connection-factory> +</connection-factories> \ No newline at end of file Added: trunk/src/config/jboss-as-6/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/jboss-as-6/non-clustered/hornetq-configuration.xml (rev 0) +++ trunk/src/config/jboss-as-6/non-clustered/hornetq-configuration.xml 2010-04-26 16:25:35 UTC (rev 9170) @@ -0,0 +1,93 @@ +<!-- + ~ Copyright 2009 Red Hat, Inc. + ~ Red Hat licenses this file to you under the Apache License, version + ~ 2.0 (the "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + ~ implied. See the License for the specific language governing + ~ permissions and limitations under the License. + --> + +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + + <log-delegate-factory-class-name>org.hornetq.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name> + + <bindings-directory>${jboss.server.data.dir}/hornetq/bindings</bindings-directory> + + <journal-directory>${jboss.server.data.dir}/hornetq/journal</journal-directory> + + <journal-min-files>10</journal-min-files> + + <large-messages-directory>${jboss.server.data.dir}/hornetq/largemessages</large-messages-directory> + + <paging-directory>${jboss.server.data.dir}/hornetq/paging</paging-directory> + + <connectors> + <connector name="netty"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + </connector> + + <connector name="netty-throughput"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="batch-delay" value="50"/> + </connector> + + <connector name="in-vm"> + <factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class> + <param key="server-id" value="${hornetq.server-id:0}"/> + </connector> + + </connectors> + + <acceptors> + <acceptor name="netty"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + </acceptor> + + <acceptor name="netty-throughput"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="batch-delay" value="50"/> + </acceptor> + + <acceptor name="in-vm"> + <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> + <param key="server-id" value="0"/> + </acceptor> + + </acceptors> + + <security-settings> + <security-setting match="#"> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" 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="#"> + <dead-letter-address>jms.queue.DLQ</dead-letter-address> + <expiry-address>jms.queue.ExpiryQueue</expiry-address> + <redelivery-delay>0</redelivery-delay> + <max-size-bytes>10485760</max-size-bytes> + <message-counter-history-day-limit>10</message-counter-history-day-limit> + <address-full-policy>BLOCK</address-full-policy> + </address-setting> + </address-settings> + +</configuration> Added: trunk/src/config/jboss-as-6/non-clustered/hornetq-jboss-beans.xml =================================================================== --- trunk/src/config/jboss-as-6/non-clustered/hornetq-jboss-beans.xml (rev 0) +++ trunk/src/config/jboss-as-6/non-clustered/hornetq-jboss-beans.xml 2010-04-26 16:25:35 UTC (rev 9170) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- MBean server --> + <bean name="MBeanServer" class="javax.management.MBeanServer"> + <constructor factoryClass="org.jboss.mx.util.MBeanServerLocator" + factoryMethod="locateJBoss"/> + </bean> + + <!-- The core configuration --> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> + <property name="configurationUrl">${jboss.server.home.url}/deploy/hornetq/hornetq-configuration.xml</property> + </bean> + + <!-- The security manager --> + <bean name="HornetQSecurityManager" class="org.hornetq.integration.jboss.security.JBossASSecurityManager"> + <start ignored="true"/> + <stop ignored="true"/> + <depends>JBossSecurityJNDIContextEstablishment</depends> + </bean> + + <!-- The core server --> + <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl"> + <constructor> + <parameter> + <inject bean="Configuration"/> + </parameter> + <parameter> + <inject bean="MBeanServer"/> + </parameter> + <parameter> + <inject bean="HornetQSecurityManager"/> + </parameter> + </constructor> + <start ignored="true"/> + <stop ignored="true"/> + </bean> + + <!-- The JMS server --> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> + <constructor> + <parameter> + <inject bean="HornetQServer"/> + </parameter> + </constructor> + </bean> + +</deployment> Added: trunk/src/config/jboss-as-6/non-clustered/hornetq-jms.xml =================================================================== --- trunk/src/config/jboss-as-6/non-clustered/hornetq-jms.xml (rev 0) +++ trunk/src/config/jboss-as-6/non-clustered/hornetq-jms.xml 2010-04-26 16:25:35 UTC (rev 9170) @@ -0,0 +1,43 @@ +<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> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/ConnectionFactory"/> + <entry name="/XAConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="NettyThroughputConnectionFactory"> + <connectors> + <connector-ref connector-name="netty-throughput"/> + </connectors> + <entries> + <entry name="/ThroughputConnectionFactory"/> + <entry name="/XAThroughputConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="InVMConnectionFactory"> + <connectors> + <connector-ref connector-name="in-vm"/> + </connectors> + <entries> + <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> + +</configuration> \ No newline at end of file Added: trunk/src/config/jboss-as-6/non-clustered/jms-ds.xml =================================================================== --- trunk/src/config/jboss-as-6/non-clustered/jms-ds.xml (rev 0) +++ trunk/src/config/jboss-as-6/non-clustered/jms-ds.xml 2010-04-26 16:25:35 UTC (rev 9170) @@ -0,0 +1,26 @@ +<connection-factories> + <!-- + JMS Stuff + --> + + <mbean code="org.jboss.jms.jndi.JMSProviderLoader" name="hornetq:service=JMSProviderLoader,name=JMSProvider"> + <attribute name="ProviderName">DefaultJMSProvider</attribute> + <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute> + <attribute name="FactoryRef">java:/XAConnectionFactory</attribute> + <attribute name="QueueFactoryRef">java:/XAConnectionFactory</attribute> + <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute> + </mbean> + <!-- + JMS XA Resource adapter, use this to get transacted JMS in beans + --> + <tx-connection-factory> + <jndi-name>JmsXA</jndi-name> + <xa-transaction/> + <rar-name>jms-ra.rar</rar-name> + <connection-definition>org.hornetq.ra.HornetQRAConnectionFactory</connection-definition> + <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property> + <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property> + <max-pool-size>20</max-pool-size> + <security-domain-and-application>JmsXARealm</security-domain-and-application> + </tx-connection-factory> +</connection-factories> \ No newline at end of file