[jboss-cvs] JBossAS SVN: r104283 - in trunk: component-matrix and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 27 22:35:42 EDT 2010
Author: clebert.suconic at jboss.com
Date: 2010-04-27 22:35:41 -0400 (Tue, 27 Apr 2010)
New Revision: 104283
Removed:
trunk/hornetq-int/src/resources/config/clustered/hornetq-configuration.xml
trunk/hornetq-int/src/resources/config/clustered/hornetq-jboss-beans.xml
trunk/hornetq-int/src/resources/config/clustered/hornetq-jms.xml
trunk/hornetq-int/src/resources/config/clustered/jms-ds.xml
trunk/hornetq-int/src/resources/config/non-clustered/hornetq-configuration.xml
trunk/hornetq-int/src/resources/config/non-clustered/hornetq-jboss-beans.xml
trunk/hornetq-int/src/resources/config/non-clustered/hornetq-jms.xml
trunk/hornetq-int/src/resources/config/non-clustered/jms-ds.xml
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
Log:
HornetQ Beta3 release
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-04-27 22:07:24 UTC (rev 104282)
+++ trunk/build/build.xml 2010-04-28 02:35:41 UTC (rev 104283)
@@ -1838,20 +1838,34 @@
Default configuration
-->
<mkdir dir="${install.default.deploy}/hornetq"/>
- <copy todir="${install.default.deploy}/hornetq">
- <fileset dir="${hornetq.module.output}/resources/config/non-clustered"/>
- </copy>
+ <!-- if you want hornetq-config files on the integration project instead:
+ <copy todir="${install.default.deploy}/hornetq">
+ <fileset dir="${hornetq.module.output}/resources/config/non-clustered"/>
+ </copy> -->
- <mkdir dir="${install.default.deploy}/jms-ra.rar"/>
+ <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.default.deploy}/hornetq">
+ <patternset includes="jboss-as-6/non-clustered/*" excludes="**/hornetq-users.properties,**/hornetq-roles.properties,**/hornetq-roles.properties,**/login-config.xml">
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+ <mkdir dir="${install.default.deploy}/jms-ra.rar"/>
<mkdir dir="${install.default.deploy}/jms-ra.rar/META-INF"/>
<!--
All configuration
-->
<mkdir dir="${install.all.deploy}/hornetq"/>
+ <!-- if you want hornetq-config flies on the integration project instead
<copy todir="${install.all.deploy}/hornetq">
<fileset dir="${hornetq.module.output}/resources/config/clustered"/>
- </copy>
+ </copy> -->
+
+ <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.all.deploy}/hornetq">
+ <patternset includes="jboss-as-6/clustered/*" excludes="**/hornetq-users.properties,**/hornetq-roles.properties,**/hornetq-roles.properties,**/login-config.xml">
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+
<mkdir dir="${install.all.deploy}/jms-ra.rar"/>
<mkdir dir="${install.all.deploy}/jms-ra.rar/META-INF"/>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-04-27 22:07:24 UTC (rev 104282)
+++ trunk/component-matrix/pom.xml 2010-04-28 02:35:41 UTC (rev 104283)
@@ -37,7 +37,7 @@
<version.beanvalidation.integration>1.0.0-Beta-1</version.beanvalidation.integration>
<version.commons.beanutils>1.8.0</version.commons.beanutils>
<version.fastinfoset>1.2.2</version.fastinfoset>
- <version.hornetq>2.1.0.BETA2</version.hornetq>
+ <version.hornetq>2.1.0.BETA3</version.hornetq>
<version.rhq>1.4.0.B01</version.rhq>
<version.inject.api>1</version.inject.api>
<version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
Deleted: trunk/hornetq-int/src/resources/config/clustered/hornetq-configuration.xml
===================================================================
--- trunk/hornetq-int/src/resources/config/clustered/hornetq-configuration.xml 2010-04-27 22:07:24 UTC (rev 104282)
+++ trunk/hornetq-int/src/resources/config/clustered/hornetq-configuration.xml 2010-04-28 02:35:41 UTC (rev 104283)
@@ -1,106 +0,0 @@
-<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>
Deleted: trunk/hornetq-int/src/resources/config/clustered/hornetq-jboss-beans.xml
===================================================================
--- trunk/hornetq-int/src/resources/config/clustered/hornetq-jboss-beans.xml 2010-04-27 22:07:24 UTC (rev 104282)
+++ trunk/hornetq-int/src/resources/config/clustered/hornetq-jboss-beans.xml 2010-04-28 02:35:41 UTC (rev 104283)
@@ -1,49 +0,0 @@
-<?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>
Deleted: trunk/hornetq-int/src/resources/config/clustered/hornetq-jms.xml
===================================================================
--- trunk/hornetq-int/src/resources/config/clustered/hornetq-jms.xml 2010-04-27 22:07:24 UTC (rev 104282)
+++ trunk/hornetq-int/src/resources/config/clustered/hornetq-jms.xml 2010-04-28 02:35:41 UTC (rev 104283)
@@ -1,43 +0,0 @@
-<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
Deleted: trunk/hornetq-int/src/resources/config/clustered/jms-ds.xml
===================================================================
--- trunk/hornetq-int/src/resources/config/clustered/jms-ds.xml 2010-04-27 22:07:24 UTC (rev 104282)
+++ trunk/hornetq-int/src/resources/config/clustered/jms-ds.xml 2010-04-28 02:35:41 UTC (rev 104283)
@@ -1,26 +0,0 @@
-<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
Deleted: trunk/hornetq-int/src/resources/config/non-clustered/hornetq-configuration.xml
===================================================================
--- trunk/hornetq-int/src/resources/config/non-clustered/hornetq-configuration.xml 2010-04-27 22:07:24 UTC (rev 104282)
+++ trunk/hornetq-int/src/resources/config/non-clustered/hornetq-configuration.xml 2010-04-28 02:35:41 UTC (rev 104283)
@@ -1,80 +0,0 @@
-<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>
Deleted: trunk/hornetq-int/src/resources/config/non-clustered/hornetq-jboss-beans.xml
===================================================================
--- trunk/hornetq-int/src/resources/config/non-clustered/hornetq-jboss-beans.xml 2010-04-27 22:07:24 UTC (rev 104282)
+++ trunk/hornetq-int/src/resources/config/non-clustered/hornetq-jboss-beans.xml 2010-04-28 02:35:41 UTC (rev 104283)
@@ -1,49 +0,0 @@
-<?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>
Deleted: trunk/hornetq-int/src/resources/config/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/hornetq-int/src/resources/config/non-clustered/hornetq-jms.xml 2010-04-27 22:07:24 UTC (rev 104282)
+++ trunk/hornetq-int/src/resources/config/non-clustered/hornetq-jms.xml 2010-04-28 02:35:41 UTC (rev 104283)
@@ -1,43 +0,0 @@
-<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
Deleted: trunk/hornetq-int/src/resources/config/non-clustered/jms-ds.xml
===================================================================
--- trunk/hornetq-int/src/resources/config/non-clustered/jms-ds.xml 2010-04-27 22:07:24 UTC (rev 104282)
+++ trunk/hornetq-int/src/resources/config/non-clustered/jms-ds.xml 2010-04-28 02:35:41 UTC (rev 104283)
@@ -1,26 +0,0 @@
-<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
More information about the jboss-cvs-commits
mailing list