Author: jmesnil Date: 2010-07-19 12:09:02 -0400 (Mon, 19 Jul 2010) New Revision: 9425 Modified: branches/2_2_0_HA_Improvements/build-hornetq.xml branches/2_2_0_HA_Improvements/src/config/jboss-as-4/clustered/hornetq-configuration.xml branches/2_2_0_HA_Improvements/src/config/jboss-as-5/clustered/hornetq-configuration.xml branches/2_2_0_HA_Improvements/src/config/jboss-as-6/clustered/hornetq-configuration.xml branches/2_2_0_HA_Improvements/src/config/stand-alone/clustered/hornetq-configuration.xml branches/2_2_0_HA_Improvements/src/config/trunk/clustered/hornetq-configuration.xml Log: HA refactoring * fix shipped clustered server configuration * in build-hornetq.xml, add validation for JBoss AS 6 and trunk configuration Modified: branches/2_2_0_HA_Improvements/build-hornetq.xml =================================================================== --- branches/2_2_0_HA_Improvements/build-hornetq.xml 2010-07-19 15:55:37 UTC (rev 9424) +++ branches/2_2_0_HA_Improvements/build-hornetq.xml 2010-07-19 16:09:02 UTC (rev 9425) @@ -102,6 +102,8 @@ <property name="src.config.jbossas4.clustered.dir" value="${src.dir}/config/jboss-as-4/clustered"/> <property name="src.config.jbossas5.non-clustered.dir" value="${src.dir}/config/jboss-as-5/non-clustered"/> <property name="src.config.jbossas5.clustered.dir" value="${src.dir}/config/jboss-as-5/clustered"/> + <property name="src.config.jbossas6.non-clustered.dir" value="${src.dir}/config/jboss-as-6/non-clustered"/> + <property name="src.config.jbossas6.clustered.dir" value="${src.dir}/config/jboss-as-6/clustered"/> <property name="src.config.service.dir" value="${src.dir}/config/service"/> <property name="src.schema.dir" value="${src.config.dir}/common/schema"/> <property name="src.bin.dir" value="${src.dir}/bin"/> @@ -583,8 +585,24 @@ file="${src.schema.dir}/hornetq-users.xsd"/> </schemavalidate> - <!-- AS 4 configuration validation --> + <!-- trunk configuration validation --> <antcall target="-validate-configuration"> + <param name="conf.dir" value="${src.config.trunk.non-clustered.dir}"/> + </antcall> + <schemavalidate file="${src.config.trunk.non-clustered.dir}/hornetq-users.xml"> + <schema namespace="urn:hornetq" + file="${src.schema.dir}/hornetq-users.xsd"/> + </schemavalidate> + <antcall target="-validate-configuration"> + <param name="conf.dir" value="${src.config.trunk.clustered.dir}"/> + </antcall> + <schemavalidate file="${src.config.trunk.clustered.dir}/hornetq-users.xml"> + <schema namespace="urn:hornetq" + file="${src.schema.dir}/hornetq-users.xsd"/> + </schemavalidate> + + <!-- AS 4 configuration validation --> + <antcall target="-validate-configuration"> <param name="conf.dir" value="${src.config.jbossas4.non-clustered.dir}"/> </antcall> <antcall target="-validate-configuration"> @@ -597,6 +615,13 @@ <antcall target="-validate-configuration"> <param name="conf.dir" value="${src.config.jbossas5.clustered.dir}"/> </antcall> + <!-- AS 6 configuration validation --> + <antcall target="-validate-configuration"> + <param name="conf.dir" value="${src.config.jbossas6.non-clustered.dir}"/> + </antcall> + <antcall target="-validate-configuration"> + <param name="conf.dir" value="${src.config.jbossas6.clustered.dir}"/> + </antcall> </target> <target name="-validate-configuration"> Modified: branches/2_2_0_HA_Improvements/src/config/jboss-as-4/clustered/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/src/config/jboss-as-4/clustered/hornetq-configuration.xml 2010-07-19 15:55:37 UTC (rev 9424) +++ branches/2_2_0_HA_Improvements/src/config/jboss-as-4/clustered/hornetq-configuration.xml 2010-07-19 16:09:02 UTC (rev 9425) @@ -77,7 +77,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>5000</broadcast-period> - <connector-ref connector-name="netty"/> + <connector-ref>netty</connector-ref> </broadcast-group> </broadcast-groups> @@ -92,6 +92,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty</connector-ref> <discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> </cluster-connections> Modified: branches/2_2_0_HA_Improvements/src/config/jboss-as-5/clustered/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/src/config/jboss-as-5/clustered/hornetq-configuration.xml 2010-07-19 15:55:37 UTC (rev 9424) +++ branches/2_2_0_HA_Improvements/src/config/jboss-as-5/clustered/hornetq-configuration.xml 2010-07-19 16:09:02 UTC (rev 9425) @@ -77,7 +77,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>5000</broadcast-period> - <connector-ref connector-name="netty"/> + <connector-ref>netty</connector-ref> </broadcast-group> </broadcast-groups> @@ -92,6 +92,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty</connector-ref> <discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> </cluster-connections> Modified: branches/2_2_0_HA_Improvements/src/config/jboss-as-6/clustered/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/src/config/jboss-as-6/clustered/hornetq-configuration.xml 2010-07-19 15:55:37 UTC (rev 9424) +++ branches/2_2_0_HA_Improvements/src/config/jboss-as-6/clustered/hornetq-configuration.xml 2010-07-19 16:09:02 UTC (rev 9425) @@ -77,7 +77,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>5000</broadcast-period> - <connector-ref connector-name="netty"/> + <connector-ref>netty</connector-ref> </broadcast-group> </broadcast-groups> @@ -92,6 +92,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty</connector-ref> <discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> </cluster-connections> Modified: branches/2_2_0_HA_Improvements/src/config/stand-alone/clustered/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/src/config/stand-alone/clustered/hornetq-configuration.xml 2010-07-19 15:55:37 UTC (rev 9424) +++ branches/2_2_0_HA_Improvements/src/config/stand-alone/clustered/hornetq-configuration.xml 2010-07-19 16:09:02 UTC (rev 9425) @@ -50,7 +50,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>5000</broadcast-period> - <connector-ref connector-name="netty"/> + <connector-ref>netty</connector-ref> </broadcast-group> </broadcast-groups> @@ -65,6 +65,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty</connector-ref> <discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> </cluster-connections> Modified: branches/2_2_0_HA_Improvements/src/config/trunk/clustered/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/src/config/trunk/clustered/hornetq-configuration.xml 2010-07-19 15:55:37 UTC (rev 9424) +++ branches/2_2_0_HA_Improvements/src/config/trunk/clustered/hornetq-configuration.xml 2010-07-19 16:09:02 UTC (rev 9425) @@ -42,7 +42,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>5000</broadcast-period> - <connector-ref connector-name="netty"/> + <connector-ref>netty</connector-ref> </broadcast-group> </broadcast-groups> @@ -57,6 +57,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty</connector-ref> <discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> </cluster-connections>