[jboss-cvs] JBossAS SVN: r110853 - in branches/JBPAPP_5_1: component-matrix and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 8 14:01:24 EST 2011
Author: clebert.suconic at jboss.com
Date: 2011-03-08 14:01:24 -0500 (Tue, 08 Mar 2011)
New Revision: 110853
Added:
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq-backup1/
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq-backup1/hornetq-configuration.xml
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq-backup1/hornetq-jboss-beans.xml
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/hornetq-configuration.xml
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/hornetq-jboss-beans.xml
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/hornetq-jms.xml
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/jms-ds.xml
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/README.txt
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq-backup1/
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq-backup1/hornetq-configuration.xml
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq-backup1/hornetq-jboss-beans.xml
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/hornetq-configuration.xml
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/hornetq-jboss-beans.xml
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/hornetq-jms.xml
branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/jms-ds.xml
Modified:
branches/JBPAPP_5_1/build/build-distr.xml
branches/JBPAPP_5_1/component-matrix/pom.xml
branches/JBPAPP_5_1/hornetq-int/jboss-as-hornetq-int.iml
branches/JBPAPP_5_1/hornetq-int/src/etc/README.txt
branches/JBPAPP_5_1/hornetq-int/src/etc/build.xml
branches/JBPAPP_5_1/hornetq-int/src/etc/switch.sh
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DeploymentFactory.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQJMSDeployment.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/AddressSettingsMapper.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSServerMO.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java
branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSConfiguration.java
branches/JBPAPP_5_1/hornetq-int/src/resources/jbossts-properties.xml
branches/JBPAPP_5_1/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
Log:
merge hornetQ changes from eap-hq-branch
Modified: branches/JBPAPP_5_1/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_1/build/build-distr.xml 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/build/build-distr.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -846,6 +846,9 @@
<include name="ra.xml"/>
<include name="jboss-as-6/**/*"/>
</fileset>
+ <fileset dir="${_module.output}/resources">
+ <include name="examples/**/**/**/*"/>
+ </fileset>
</copy>
<copy todir="${install.root}/extras/hornetq/lib">
<fileset dir="${org.hornetq.lib}"></fileset>
Modified: branches/JBPAPP_5_1/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_1/component-matrix/pom.xml 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/component-matrix/pom.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -44,7 +44,7 @@
<version.jboss.jbossws>3.1.2.SP8</version.jboss.jbossws>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.messaging>1.4.7.GA</version.jboss.messaging>
- <version.hornetq>2.2.0.QA-10035</version.hornetq>
+ <version.hornetq>2.2.1.QA-10291</version.hornetq>
<version.jboss.web>2.1.11.GA</version.jboss.web>
<version.jgroups>2.6.19.Final</version.jgroups>
<version.junit>3.8.2</version.junit>
Modified: branches/JBPAPP_5_1/hornetq-int/jboss-as-hornetq-int.iml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/jboss-as-hornetq-int.iml 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/jboss-as-hornetq-int.iml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -1,220 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MAVEN_REPOSITORY$/org/jboss/jbossas/jboss-as-component-matrix/6.0.0-SNAPSHOT/target/classes" />
+ <output-test url="file://$MAVEN_REPOSITORY$/org/jboss/jbossas/jboss-as-component-matrix/6.0.0-SNAPSHOT/target/test-classes" />
+ <exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.mx:jboss-j2se:6.0.0.Beta5" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss:jboss-common-core:2.2.17.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.integration:jboss-classloading-spi:6.0.0.Alpha9" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jbossas:jboss-as-system-jmx:6.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" exported="" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.logging:jboss-logging:3.0.0.Beta2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss:jboss-vfs:3.0.0.CR5" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss:jbossxb:2.0.2.Beta7" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss:jboss-reflect:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: sun-jaxb:jaxb-api:2.2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.deployers:jboss-deployers-core-spi:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.deployers:jboss-deployers-impl:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.deployers:jboss-deployers-spi:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.deployers:jboss-deployers-structure-spi:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.deployers:jboss-deployers-client-spi:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.man:jboss-managed:2.1.1.SP1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.man:jboss-metatype:2.1.1.SP1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss:jboss-mdr:2.2.0.Alpha2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.mcann:mcann-core:1.0.0.Alpha2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.cl:jboss-classloading-vfs:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.cl:jboss-classloader:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: javassist:javassist:3.11.0.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.cl:jboss-classloading:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.kernel:jboss-kernel:2.2.0.Alpha9" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.kernel:jboss-dependency:2.2.0.Alpha9" level="project" />
- <orderEntry type="library" exported="" name="Maven: javax.inject:javax.inject:1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.deployers:jboss-deployers-vfs:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.deployers:jboss-deployers-vfs-spi:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: stax:stax-api:1.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.deployers:jboss-deployers-core:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.deployers:jboss-deployers-client:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.bootstrap:jboss-bootstrap-spi-as:2.1.0-alpha-4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.bootstrap:jboss-bootstrap-spi-mc:2.1.0-alpha-4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.bootstrap:jboss-bootstrap-spi:2.1.0-alpha-4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.bootstrap:jboss-bootstrap-api:2.1.0-alpha-4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.bootstrap:jboss-bootstrap-api-mc:2.1.0-alpha-4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.bootstrap:jboss-bootstrap-api-as:2.1.0-alpha-4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jbossas:jboss-as-system:6.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.aop:jboss-aop:2.2.0.Final" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.apache.ant:ant:1.7.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.apache.ant:ant-launcher:1.7.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.classpool:jboss-classpool-scoped:1.0.0.Alpha5" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.classpool:jboss-classpool:1.0.0.Alpha5" level="project" />
- <orderEntry type="library" exported="" name="Maven: qdox:qdox:1.6.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: trove:trove:1.0.2" level="project" />
- <orderEntry type="library" exported="" name="Maven: log4j:log4j:1.2.14" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.aop:jboss-aop-deployers:2.2.0.Final" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.aop:jboss-aop-asintegration-mc:2.2.0.Final" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.classpool:jboss-classpool-jbosscl:1.0.0.Alpha5" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.classpool:jboss-classpool:test-jar:tests:1.0.0.Alpha5" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.aop:pluggable-instrumentor:2.2.0.Final" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.aop:jboss-aop-asintegration-core:2.2.0.Final" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.jboss.test:jboss-test:1.1.6.GA" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: jboss.profiler.jvmti:jboss-profiler-jvmti:1.0.0.CR5" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.6" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.jboss.jbossas:jboss-server-manager:1.0.3.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.naming:jnp-client:5.0.5.Final" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.security:jbosssx-client:3.0.0.Beta4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.security:jboss-security-spi:3.0.0.Beta4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.kernel:jboss-aop-mc-int:2.2.0.Alpha9" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.integration:jboss-profileservice-spi:6.0.0.Alpha9" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.picketbox:picketbox-bare:3.0.0.Beta4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.security:jbosssx:3.0.0.Beta4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.mx:jboss-jmx:6.0.0.Beta5" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.mx:jboss-mbeans:6.0.0.Beta5" level="project" />
- <orderEntry type="library" exported="" name="Maven: dom4j:dom4j:1.6.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.mx:jboss-jmx-annotations:6.0.0.Beta5" level="project" />
- <orderEntry type="library" exported="" name="Maven: bcel:bcel:5.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.kernel:jboss-jmx-mc-int:2.2.0.Alpha9" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.mx:jboss-mbeanserver:6.0.0.Beta5" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.deployers:jboss-deployers-jmx:2.2.0.Alpha4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.metadata:jboss-metadata-common:2.0.0.Alpha14" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ws:jbossws-spi:1.3.0.CR1.SP1" level="project" />
- <orderEntry type="library" exported="" name="Maven: gnu-getopt:getopt:1.0.12-brew" level="project" />
- <orderEntry type="library" exported="" name="Maven: jboss.jbossws:jboss-jaxws:3.0.1-native-2.0.4.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.metadata:jboss-metadata-client:2.0.0.Alpha2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.metadata:jboss-metadata-ejb:2.0.0-alpha-10" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:1.0.0.Beta2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Beta1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ws.native:jbossws-native-jaxrpc:3.2.2.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ws.native:jbossws-native-saaj:3.2.2.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-ext-api:1.1.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jbossas:jboss-as-ejb3:6.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" exported="" name="Maven: cglib:cglib:2.1.3" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.hibernate:hibernate-core:3.5.0-CR-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: antlr:antlr:2.7.6-brew" level="project" />
- <orderEntry type="library" exported="" name="Maven: commons-collections:commons-collections:3.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.slf4j:slf4j-api:1.5.6" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.hibernate:hibernate-annotations:3.5.0-CR-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.hibernate:hibernate-commons-annotations:3.2.0.Beta1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0-CR-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: jacorb:jacorb:2.3.1jboss.patch01-brew" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.remoting:jboss-remoting:2.5.2.SP2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.hibernate:hibernate-entitymanager:3.5.0-CR-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.cluster:jboss-ha-client:1.1.1.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3_1:1.0.7" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-cache:1.0.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: jboss:jboss-serialization:1.0.3.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-common:1.0.2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-core:1.3.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.integration:jboss-jca-spi:5.0.3.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.aspects:jboss-remoting-aspects:1.0.1.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.aspects:jboss-transaction-aspects:1.0.0.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.aspects:jboss-security-aspects:1.0.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.cluster:jboss-ha-server-api:1.1.1.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-endpoint:0.1.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-jpa-int:2.0.0-alpha-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-security:1.0.2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.aspects:jboss-current-invocation-aspects:1.0.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-interceptors:1.0.6" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-metadata:1.0.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-ext-api-impl:1.1.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-timerservice-spi:1.0.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-proxy-impl:1.0.6" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-proxy-spi:1.0.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.naming:jnpserver:5.0.5.Final" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-proxy-clustered:1.0.3" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-transactions:1.0.2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.integration:jboss-transaction-spi:6.0.0.Alpha9" level="project" />
- <orderEntry type="library" exported="" name="Maven: oswego-concurrent:concurrent:1.3.4-jboss-update1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.context:jboss-ejb3-context-base:0.1.1" level="project" />
- <orderEntry type="library" exported="" scope="RUNTIME" name="Maven: org.jboss.ejb3.context:jboss-ejb3-context-naming:0.1.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.timeout:jboss-ejb3-timeout-spi:0.1.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.vfs:jboss-ejb3-vfs-spi:1.0.0-alpha-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jpa:jboss-jpa-deployers:1.0.2-alpha-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jpa:jboss-jpa-impl:2.0.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jpa:jboss-jpa-spi:1.0.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: quartz:quartz:1.6.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: sun-jaxws:jaxws-api:2.1.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: sun-jaxws:jsr181-api:2.1.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-deployers:1.1.2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jbossas:jboss-as-server:6.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jbossas:jboss-as-deployment:6.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.spec.javax.enterprise.deploy:jboss-jad-api_1.2_spec:1.0.0.Beta1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.metadata:jboss-metadata-ear:2.0.0.Alpha3" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.metadata:jboss-metadata-rar:2.0.0.Alpha" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.metadata:jboss-metadata-war:2.0.0.Alpha14" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.0.Beta2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Beta2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.spec.javax.resource:jboss-connector-api_1.5_spec:1.0.0.Beta1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Beta1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jbossas:jboss-as-security:6.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:1.0.0.Beta1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.security:jbossxacml:2.0.5.CR1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.apache:xmlsec:1.4.3" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.integration:jboss-deployment-spi:6.0.0.Alpha9" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jpa:jboss-jpa-vfs3:1.0.2-alpha-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.reloaded:jboss-reloaded-naming:0.1.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.reloaded:jboss-reloaded-naming-deployers:0.1.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:1.0.0.Beta1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:1.0.0.Beta2" level="project" />
- <orderEntry type="library" exported="" name="Maven: javax.xml.soap:saaj-api:1.3" level="project" />
- <orderEntry type="library" exported="" name="Maven: javax.xml.ws:jaxws-api:2.2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.service.binding:jboss-service-binding-core:1.1.0.CR1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.service.binding:jboss-service-binding-mgmt:1.1.0.CR1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-metadata-deployers:1.0.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.nointerface:jboss-ejb3-nointerface-impl:1.0.0-alpha-6" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.nointerface:jboss-ejb3-nointerface-spi:1.0.0-alpha-6" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.proxy:proxy-javassist:1.0.0-alpha-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.proxy:proxy-spi:1.0.0-alpha-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.singleton:jboss-ejb3-singleton-aop-impl:1.0.0-alpha-2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.singleton:jboss-ejb3-singleton-impl:1.0.0-alpha-2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.singleton:jboss-ejb3-singleton-spi:1.0.0-alpha-2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.container:jboss-ejb3-container-spi:1.0.0-alpha-2" level="project" />
- <orderEntry type="library" exported="" scope="RUNTIME" name="Maven: org.jboss.ejb3.concurrency:jboss-ejb3-concurrency-aop:1.0.0-alpha-1" level="project" />
- <orderEntry type="library" exported="" scope="RUNTIME" name="Maven: org.jboss.ejb3.concurrency:jboss-ejb3-concurrency-impl:1.0.0-alpha-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.singleton:jboss-ejb3-singleton-deployer:1.0.0-alpha-2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.singleton:jboss-ejb3-singleton-proxy-impl:1.0.0-alpha-2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.proxy:proxy-reflect:1.0.0-alpha-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3:jboss-ejb3-core:client:1.3.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.metadata:jboss-metadata:1.0.4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.cache:jbosscache-core:3.2.1.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: jgroups:jgroups:2.10.0.Alpha3" level="project" />
- <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging:1.1.0.jboss" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.vfs:jboss-ejb3-vfs-impl-vfs3:1.0.0-alpha-1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.ejb3.timeout:jboss-ejb3-timeout-3.1:0.1.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jbossas:jboss-as-connector:6.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" exported="" name="Maven: javax.mail:mail:1.4.2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.integration:jboss-integration:6.0.0.Alpha9" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.stdio:jboss-stdio:1.0.0.CR3" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.threads:jboss-threads:2.0.0.CR4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.quartz-scheduler:quartz:1.7.3" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jbossas:jboss-as-iiop:6.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" exported="" name="Maven: jboss.jbossts:jbossjts:4.9.0.GA" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.integration:jboss-corba-ots-spi:6.0.0.Alpha9" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.jboss.jbossas:jboss-as-main:6.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.hornetq:hornetq-resources:2.1.0.BETA2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.hornetq:hornetq-core:2.1.0.BETA2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.hornetq:hornetq-jms:2.1.0.BETA2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.rhq:rhq-core-domain:1.4.0.B01" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.rhq:rhq-core-util:1.4.0.B01" level="project" />
- <orderEntry type="library" exported="" name="Maven: jdom:jdom:1.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: i18nlog:i18nlog:1.0.9" level="project" />
- <orderEntry type="library" exported="" name="Maven: javax.xml.bind:jaxb-api:2.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.rhq:rhq-core-plugin-api:1.4.0.B01" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.rhq:rhq-core-native-system:1.4.0.B01" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.hyperic:sigar:1.6.3.82" level="project" />
- <orderEntry type="library" exported="" name="Maven: com.sun.xml.bind:jaxb-impl:2.2" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.rhq:rhq-jmx-plugin:1.4.0.B01" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: mc4j:org-mc4j-ems:1.2.11" level="project" />
- <orderEntry type="library" name="Maven: com.sun:tools:1.4.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-junit:1.7.0" level="project" />
+ <orderEntry type="library" name="hornetQ" level="project" />
</component>
</module>
Modified: branches/JBPAPP_5_1/hornetq-int/src/etc/README.txt
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/etc/README.txt 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/etc/README.txt 2011-03-08 19:01:24 UTC (rev 110853)
@@ -2,6 +2,9 @@
if on Windows) on a clean install. This will remove all JBoss Messaging
components and replace them with HornetQ.
+Call the switch.sh script with -Dbackup=true to create additional profiles for
+dedicated backup server usage.
+
You can find the HornetQ documentation at http://jboss.org/hornetq/docs.html.
There are some JMS and Java EE examples under the examples directory. To run
Modified: branches/JBPAPP_5_1/hornetq-int/src/etc/build.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/etc/build.xml 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/etc/build.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -16,6 +16,11 @@
<property name="jboss_home" value="../../"/>
<property name="lib.dir" value="lib"/>
<property name="resources.dir" value="resources"/>
+ <property name="backup.suffix" value="-backup"/>
+ <property name="backup" value="false"/>
+ <condition property="backupTrue">
+ <equals arg1="${backup}" arg2="true"/>
+ </condition>
<target name="install" depends="removeCommon, removeClient, addCommon, addClient">
@@ -52,11 +57,24 @@
<param name="CONFIG_TYPE" value="clustered"/>
</antcall>
- <!--we need to disable guest security for production-->
- <replace file="${jboss_home}/server/production/conf/props/hornetq-users.properties" token="guest=guest" value="#guest=guest"/>
- <replace file="${jboss_home}/server/production/conf/props/hornetq-roles.properties" token="guest=guest" value="#guest=guest"/>
+ <!-- we need to disable guest security for production-based profiles -->
+ <replace dir="${jboss_home}" token="guest=guest" value="#guest=guest">
+ <include name="server/production*/conf/props/hornetq-*.properties"/>
+ </replace>
+
+ <available file="${lib.dir}/hornetq-jopr-plugin.jar" property="PLUGIN_EXISTS"/>
+
+ <antcall target="copy-jopr-plugin"/>
</target>
+ <target name="copy-jopr-plugin" if="PLUGIN_EXISTS">
+ <!-- this can be removed once the admin console is handled better-->
+ <copy todir="${jboss_home}/server/all/deploy/admin-console.war/plugins/" file="${lib.dir}/hornetq-jopr-plugin.jar" overwrite="true"/>
+ <copy todir="${jboss_home}/server/web/deploy/admin-console.war/plugins/" file="${lib.dir}/hornetq-jopr-plugin.jar" overwrite="true"/>
+ <copy todir="${jboss_home}/server/default/deploy/admin-console.war/plugins/" file="${lib.dir}/hornetq-jopr-plugin.jar" overwrite="true"/>
+ <copy todir="${jboss_home}/server/production/deploy/admin-console.war/plugins/" file="${lib.dir}/hornetq-jopr-plugin.jar" overwrite="true"/>
+ </target>
+
<target name="removeCommon">
<echo>Removing Common JBoss Messaging Components</echo>
<delete file="${jboss_home}/common/lib/jboss-messaging.jar"/>
@@ -124,5 +142,59 @@
<copy todir="${jboss_home}/server/${config}/deploy/jms-ra.rar/" file="${lib.dir}/hornetq-ra.jar" overwrite="true"/>
<copy todir="${jboss_home}/server/${config}/deploy/jms-ra.rar/META-INF" file="${resources.dir}/ra.xml" overwrite="true"/>
<copy todir="${jboss_home}/server/${config}/deployers/jbossws.deployer" file="${lib.dir}/jbossws-hornetq.jar" overwrite="true"/>
+ <antcall target="createBackup"></antcall>
</target>
+
+ <target name="createBackup" if="backupTrue">
+ <property name="backup.config" value="${config}${backup.suffix}"/>
+ <echo>Create HornetQ dedicated backup profile for ${config}</echo>
+ <mkdir dir="${jboss_home}/server/${backup.config}"/>
+ <copy todir="${jboss_home}/server/${backup.config}" includeemptydirs="true">
+ <fileset dir="${jboss_home}/server/${config}">
+ <include name="conf/**"/>
+ <include name="data"/>
+ <include name="deploy/hornetq/hornetq-configuration.xml"/>
+ <include name="deploy/hornetq/hornetq-jboss-beans.xml"/>
+ <include name="deploy/hornetq/hornetq-jms.xml"/>
+ <include name="deploy/security/**"/>
+ <include name="deploy/hdscanner-jboss-beans.xml"/>
+ <include name="deploy/profileservice-jboss-beans.xml"/>
+ <include name="deploy/remoting-jboss-beans.xml"/>
+ <include name="deploy/vfs-jboss-beans.xml"/>
+ <include name="deployers/logbridge-jboss-beans.xml"/>
+ <include name="deployers/security-deployer-jboss-beans.xml"/>
+ <include name="deployers/hornetq-deployers-jboss-beans.xml"/>
+ <include name="lib"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss_home}/server/${backup.config}/deploy/hornetq">
+ <fileset dir="${jboss_home}/server/${config}/deploy/jms-ra.rar">
+ <include name="hornetq-ra.jar"/>
+ </fileset>
+ </copy>
+ <!-- Use non-clustered profile service beans (from default profile) -->
+ <copy todir="${jboss_home}/server/${backup.config}/conf/bootstrap" overwrite="true">
+ <fileset dir="${jboss_home}/server/default/conf/bootstrap">
+ <include name="profile.xml"/>
+ </fileset>
+ </copy>
+ <!-- Update HornetQ configuration to enable backup mode -->
+ <replace file="${jboss_home}/server/${backup.config}/deploy/hornetq/hornetq-configuration.xml">
+ <replacetoken><![CDATA[<name>HornetQ.main.config</name>]]></replacetoken>
+ <replacevalue><![CDATA[<name>HornetQ.main.config</name>
+
+ <backup>true</backup>
+ <allow-failback>true</allow-failback>]]></replacevalue>
+ </replace>
+ <!-- Disable HornetQRAService -->
+ <replace file="${jboss_home}/server/${backup.config}/deploy/hornetq/hornetq-jboss-beans.xml">
+ <replacetoken>bean name="HornetQRAService"</replacetoken>
+ <replacevalue>bean name="HornetQRAService" mode="Disabled"</replacevalue>
+ </replace>
+ <!-- Remove dependency on TransactionManager -->
+ <replace file="${jboss_home}/server/${backup.config}/deploy/remoting-jboss-beans.xml">
+ <replacetoken><![CDATA[<depends>TransactionManager</depends>]]></replacetoken>
+ <replacevalue><![CDATA[<!--depends>TransactionManager</depends-->]]></replacevalue>
+ </replace>
+ </target>
</project>
Modified: branches/JBPAPP_5_1/hornetq-int/src/etc/switch.sh
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/etc/switch.sh 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/etc/switch.sh 2011-03-08 19:01:24 UTC (rev 110853)
@@ -1 +1 @@
-ant
\ No newline at end of file
+ant $@
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DeploymentFactory.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DeploymentFactory.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DeploymentFactory.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -62,23 +62,23 @@
try
{
-
+ ObjectNameBuilder builder = ObjectNameBuilder.create(mainConfig.getDomain());
for (JMSQueueConfiguration config : mainConfig.getQueueConfigurations())
{
- String name = ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(config.getName()).toString();
- unit.addAttachment(name, createJMSBasicBean(unit, HornetQQueueDeployment.class.getName(), name, config));
+ String name = builder.getJMSQueueObjectName(config.getName()).toString();
+ unit.addAttachment(name, createJMSBasicBean(unit, HornetQQueueDeployment.class.getName(), name, config, builder));
}
for (TopicConfiguration config : mainConfig.getTopicConfigurations())
{
- String name = ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(config.getName()).toString();
- unit.addAttachment(name, createJMSBasicBean(unit, HornetQTopicDeployment.class.getName(), name, config));
+ String name = builder.getJMSTopicObjectName(config.getName()).toString();
+ unit.addAttachment(name, createJMSBasicBean(unit, HornetQTopicDeployment.class.getName(), name, config, builder));
}
for (ConnectionFactoryConfiguration config : mainConfig.getConnectionFactoryConfigurations())
{
- String name = "org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=ConnectionFactory";
- unit.addAttachment(name, createJMSBasicBean(unit, HornetQConnectionFactoryDeployment.class.getName(), name, config));
+ String name = mainConfig.getDomain() + ":module=JMS,name=\"" + config.getName() + "\",type=ConnectionFactory";
+ unit.addAttachment(name, createJMSBasicBean(unit, HornetQConnectionFactoryDeployment.class.getName(), name, config, builder));
}
}
catch (Exception e)
@@ -90,13 +90,15 @@
/**
* @param name
*/
- private static BeanMetaData createJMSBasicBean(DeploymentUnit unit, String configClass, String name, Object config)
+ private static BeanMetaData createJMSBasicBean(DeploymentUnit unit, String configClass, String name, Object config, ObjectNameBuilder objectNameBuilder)
{
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, configClass);
builder.addPropertyMetaData("name", name);
builder.addPropertyMetaData("jmsServer", builder.createInject("JMSServerManager"));
+
+ builder.addPropertyMetaData("builder", objectNameBuilder);
builder.addPropertyMetaData("config", config);
@@ -105,6 +107,8 @@
builder.addPropertyMetaData("mbeanServer", builder.createInject("MBeanServer"));
+ builder.addDependency("HornetQ.main.config");
+
for (Map.Entry<String, Object> entry : unit.getAttachments().entrySet())
{
if (entry.getValue() instanceof BeanMetaData)
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -21,9 +21,8 @@
*/
package org.jboss.as.integration.hornetq.deployers;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.impl.ConfigurationImpl;
import org.jboss.as.integration.hornetq.deployers.pojo.HornetQCoreDeployment;
import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
import org.jboss.beans.metadata.spi.BeanMetaData;
@@ -55,8 +54,6 @@
public class HornetQCoreConfigRealDeployer extends AbstractSimpleRealDeployer<Configuration>
{
- private final AtomicInteger idGenerator = new AtomicInteger(1);
-
public HornetQCoreConfigRealDeployer()
{
super(Configuration.class);
@@ -72,14 +69,17 @@
@Override
public void deploy(DeploymentUnit unit, Configuration config) throws DeploymentException
{
- if (log.isTraceEnabled())
- {
- log.trace("Deploying unit: " + unit + " with config " + config);
- }
- String name = "HornetQCoreDeployment::" + idGenerator.incrementAndGet();
+ if (log.isTraceEnabled())
+ {
+ log.trace("Deploying unit: " + unit + " with config " + config);
+ }
+ String name = config.getName();
+
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, HornetQCoreDeployment.class.getName());
+ builder.addPropertyMetaData("jmxDomain", config.getJMXDomain());
+
builder.addPropertyMetaData("name", name);
builder.addPropertyMetaData("server", builder.createInject("HornetQServer"));
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -40,7 +40,7 @@
jmsServer.createConnectionFactory(false, config, config.getBindings());
// Register the Control MBean in MC
- registerControlReference(new ObjectName("org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=ConnectionFactory"));
+ registerControlReference(builder.getConnectionFactoryObjectName(config.getName()));
} catch (Exception e)
{
@@ -55,7 +55,7 @@
log.debug("Destroying ConnectionFactory " + config.getName());
try
{
- unregisterControlReference(new ObjectName("org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=ConnectionFactory"));
+ unregisterControlReference(builder.getConnectionFactoryObjectName(config.getName()));
jmsServer.destroyConnectionFactory(config.getName());
}
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -21,10 +21,12 @@
*/
package org.jboss.as.integration.hornetq.deployers.pojo;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import org.hornetq.api.core.SimpleString;
+import org.hornetq.core.config.BridgeConfiguration;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.security.Role;
@@ -50,6 +52,8 @@
private HornetQServer server;
private String name;
+
+ private String jmxDomain;
private Configuration config;
@@ -57,7 +61,15 @@
{
return config;
}
-
+
+ public String getJmxDomain() {
+ return jmxDomain;
+ }
+
+ public void setJmxDomain(String jmxDomain) {
+ this.jmxDomain = jmxDomain;
+ }
+
public void setConfig(Configuration config)
{
this.config = config;
@@ -101,6 +113,11 @@
{
log.trace(this.name + " is being started");
}
+
+ if (!jmxDomain.equals(server.getConfiguration().getJMXDomain()))
+ {
+ return;
+ }
for (Map.Entry<String, AddressSettings> entry : config.getAddressesSettings().entrySet())
{
@@ -127,6 +144,18 @@
log.warn("Error on creating queue " + coreQueue.getName() + " address = " + coreQueue.getAddress(), e);
}
}
+
+ for(BridgeConfiguration bridgeConfiguration : config.getBridgeConfigurations())
+ {
+ try
+ {
+ server.deployBridge(bridgeConfiguration);
+ }
+ catch (Exception e)
+ {
+ log.warn("Error deploying Bridge " + bridgeConfiguration.getName(), e);
+ }
+ }
}
@Stop
@@ -136,6 +165,11 @@
{
log.trace(this.name + " is being stopped");
}
+
+ if (!jmxDomain.equals(server.getConfiguration().getJMXDomain()))
+ {
+ return;
+ }
for (String entry : config.getAddressesSettings().keySet())
{
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQJMSDeployment.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQJMSDeployment.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQJMSDeployment.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -21,6 +21,7 @@
*/
package org.jboss.as.integration.hornetq.deployers.pojo;
+import org.hornetq.api.core.management.ObjectNameBuilder;
import org.hornetq.jms.server.JMSServerManager;
import org.jboss.as.integration.hornetq.deployers.HornetQJMSRealDeployer;
import org.jboss.logging.Logger;
@@ -39,6 +40,8 @@
protected JMSServerManager jmsServer;
+ protected ObjectNameBuilder builder;
+
protected String name;
protected T config;
@@ -73,6 +76,11 @@
return name;
}
+ public void setBuilder(ObjectNameBuilder builder)
+ {
+ this.builder = builder;
+ }
+
public abstract void start() throws Exception;
public abstract void stop() throws Exception;
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -41,7 +41,7 @@
jmsServer.createQueue(false, config.getName(), config.getSelector(), config.isDurable(), config.getBindings());
// Register the Control MBean in MC
- registerControlReference(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(config.getName()));
+ registerControlReference(builder.getJMSQueueObjectName(config.getName()));
} catch (Exception e)
{
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -38,7 +38,7 @@
try
{
jmsServer.createTopic(false, config.getName(), config.getBindings());
- registerControlReference(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(config.getName()));
+ registerControlReference(builder.getJMSTopicObjectName(config.getName()));
}
catch (Exception e)
{
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/AddressSettingsMapper.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/AddressSettingsMapper.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/AddressSettingsMapper.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -88,6 +88,7 @@
"expiryAddress",
"maxSize",
"pageSize",
+ "pageMaxCacheSize",
"maxDeliveryAttempts",
"redeliveryDelay",
"lastValueQueue",
@@ -103,6 +104,7 @@
"expiryAddress",
"maxSize",
"pageSize",
+ "pageMaxCacheSize",
"maxDeliveryAttempts",
"redeliveryDelay",
"lastValueQueue",
@@ -119,6 +121,7 @@
SimpleMetaType.INTEGER_PRIMITIVE,
SimpleMetaType.INTEGER_PRIMITIVE,
SimpleMetaType.INTEGER_PRIMITIVE,
+ SimpleMetaType.INTEGER_PRIMITIVE,
SimpleMetaType.LONG_PRIMITIVE,
SimpleMetaType.BOOLEAN_PRIMITIVE,
SimpleMetaType.LONG_PRIMITIVE,
@@ -151,6 +154,7 @@
cvs.set("expiryAddress", new SimpleValueSupport(SimpleMetaType.STRING, addressSettings.getExpiryAddress()));
cvs.set("maxSize", new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, addressSettings.getMaxSizeBytes()));
cvs.set("pageSize", new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, addressSettings.getPageSizeBytes()));
+ cvs.set("pageMaxCacheSize", new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, addressSettings.getPageCacheMaxSize()));
cvs.set("maxDeliveryAttempts", new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, addressSettings.getMaxDeliveryAttempts()));
cvs.set("redeliveryDelay", new SimpleValueSupport(SimpleMetaType.LONG_PRIMITIVE, addressSettings.getRedeliveryDelay()));
cvs.set("lastValueQueue", new SimpleValueSupport(SimpleMetaType.BOOLEAN_PRIMITIVE, addressSettings.isLastValueQueue()));
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -21,7 +21,6 @@
*/
package org.jboss.as.integration.hornetq.management.jms;
-import org.hornetq.api.core.management.ResourceNames;
import org.hornetq.api.jms.management.ConnectionFactoryControl;
import org.hornetq.api.jms.management.JMSServerControl;
import org.hornetq.core.server.HornetQServer;
@@ -40,25 +39,13 @@
public ConnectionFactoryManageMO(HornetQServer server)
{
super(server);
- this.server = server;
}
- private JMSServerControl jmsServerControl;
-
- private ManagementService managementService;
-
- private HornetQServer server;
-
- public void start()
- {
- managementService = server.getManagementService();
- jmsServerControl = (JMSServerControl) managementService.getResource(ResourceNames.JMS_SERVER);
- }
-
@ManagementOperation(name = "deleteConnectionFactory", description = "returns the JMS Connection Factory configuration",
params = {@ManagementParameter(name = "name", description = "the connection factory name")})
public void deleteConnectionFactory(String name) throws Exception
{
+ JMSServerControl jmsServerControl = getJmsServerControl();
jmsServerControl.destroyConnectionFactory(name);
}
@@ -67,7 +54,7 @@
@MetaMapping(value = ConnectionFactoryMapper.class)
public ConnectionFactoryControl getConfiguration(String name)
{
- return (ConnectionFactoryControl) managementService.getResource("jms.connectionfactory." + name);
+ return (ConnectionFactoryControl) getManagementService().getResource("jms.connectionfactory." + name);
}
@ManagementOperation(name = "getMeasurements", description = "gets a connection factories",
@@ -76,6 +63,7 @@
@ManagementParameter(name = "names", description = "the measurement names")})
public String[] getMeasurements(String name, String[] names) throws Exception
{
+ ManagementService managementService = getManagementService();
ConnectionFactoryControl control = (ConnectionFactoryControl) managementService.getResource("jms.connectionfactory." + name);
String[] val = new String[names.length];
for (int i = 0, valLength = val.length; i < valLength; i++)
@@ -97,7 +85,15 @@
@ManagementOperation(name = "getConnectionFactories", description = "returns the JMS Connection Factories")
public String[] getJMSConnectionFactories()
{
- return jmsServerControl.getConnectionFactoryNames();
+ JMSServerControl jmsServerControl = getJmsServerControl();
+ if(jmsServerControl == null)
+ {
+ return new String[]{};
+ }
+ else
+ {
+ return jmsServerControl.getConnectionFactoryNames();
+ }
}
@ManagementOperation(name = "createConnectionFactory", description = "creates a connection factories",
@@ -170,8 +166,10 @@
String connectionLoadBalancingPolicyClassName)
throws Exception
{
+ JMSServerControl jmsServerControl = getJmsServerControl();
jmsServerControl.createConnectionFactory(name, ha, useDiscovery, cfType, connectorNames, bindings);
+ ManagementService managementService = getManagementService();
ConnectionFactoryControl control = (ConnectionFactoryControl) managementService.getResource("jms.connectionfactory." + name);
control.setClientID(clientId);
control.setDupsOKBatchSize(dupsOkBatchSize);
@@ -196,7 +194,8 @@
control.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize);
control.setThreadPoolMaxSize(threadPoolMaxSize);
control.setGroupID(groupId);
- control.setInitialMessagePacketSize(initialMessagePacketSize);
+ // TODO: figure out what to do with initialPacketSize as it's not really being applied to the connection factories
+ // control.setInitialMessagePacketSize(initialMessagePacketSize);
control.setUseGlobalPools(useGlobalPools);
control.setRetryInterval(retryInterval);
control.setConnectionLoadBalancingPolicyClassName(connectionLoadBalancingPolicyClassName);
@@ -263,6 +262,7 @@
String connectionLoadBalancingPolicyClassName)
throws Exception
{
+ ManagementService managementService = getManagementService();
ConnectionFactoryControl control = (ConnectionFactoryControl) managementService.getResource("jms.connectionfactory." + name);
control.setClientID(clientId);
@@ -288,7 +288,8 @@
control.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize);
control.setThreadPoolMaxSize(threadPoolMaxSize);
control.setGroupID(groupId);
- control.setInitialMessagePacketSize(initialMessagePacketSize);
+ // TODO: figure out what to do with initialPacketSize as it's not really being applied to the connection factories
+ // control.setInitialMessagePacketSize(initialMessagePacketSize);
control.setUseGlobalPools(useGlobalPools);
control.setRetryInterval(retryInterval);
control.setConnectionLoadBalancingPolicyClassName(connectionLoadBalancingPolicyClassName);
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -33,11 +33,11 @@
*/
public class JMSManageMO
{
- protected JMSServerControl jmsServerControl;
+ private JMSServerControl jmsServerControl;
- protected ManagementService managementService;
+ private ManagementService managementService;
- protected HornetQServerControl hornetQServerControl;
+ private HornetQServerControl hornetQServerControl;
private HornetQServer server;
@@ -47,13 +47,6 @@
this.server = server;
}
- public void start()
- {
- managementService = server.getManagementService();
- jmsServerControl = (JMSServerControl) managementService.getResource(ResourceNames.JMS_SERVER);
- hornetQServerControl = (HornetQServerControl) managementService.getResource(ResourceNames.CORE_SERVER);
- }
-
protected String coomaSeparatedString(Object[] objects)
{
StringBuffer sb = new StringBuffer("");
@@ -127,4 +120,31 @@
}
return classes;
}
+
+ public JMSServerControl getJmsServerControl()
+ {
+ if(jmsServerControl == null)
+ {
+ jmsServerControl = (JMSServerControl) managementService.getResource(ResourceNames.JMS_SERVER);
+ }
+ return jmsServerControl;
+ }
+
+ public ManagementService getManagementService()
+ {
+ if(managementService == null)
+ {
+ managementService = server.getManagementService();
+ }
+ return managementService;
+ }
+
+ public HornetQServerControl getHornetQServerControl()
+ {
+ if(hornetQServerControl == null)
+ {
+ hornetQServerControl = (HornetQServerControl) managementService.getResource(ResourceNames.CORE_SERVER);
+ }
+ return hornetQServerControl;
+ }
}
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSServerMO.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSServerMO.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSServerMO.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -21,6 +21,8 @@
*/
package org.jboss.as.integration.hornetq.management.jms;
+import org.hornetq.api.core.management.HornetQServerControl;
+import org.hornetq.api.jms.management.JMSServerControl;
import org.hornetq.core.server.HornetQServer;
import org.jboss.managed.api.annotation.*;
@@ -42,13 +44,22 @@
@ManagementOperation(name = "getVersion", description = "returns the servers version")
public String getVersion()
{
- return jmsServerControl.getVersion();
+ JMSServerControl jmsServerControl = getJmsServerControl();
+ if(jmsServerControl == null)
+ {
+ return null;
+ }
+ else
+ {
+ return jmsServerControl.getVersion();
+ }
}
@ManagementOperation(name = "getVersion", description = "returns the servers status")
public boolean isStarted()
{
- return jmsServerControl.isStarted();
+ JMSServerControl jmsServerControl = getJmsServerControl();
+ return jmsServerControl != null && jmsServerControl.isStarted();
}
@ManagementOperation(name = "invokeManagerOperation", description = "invokes a queues method",
@@ -62,11 +73,13 @@
Method m = null;
try
{
+ JMSServerControl jmsServerControl = getJmsServerControl();
m = jmsServerControl.getClass().getMethod(method, classes);
return m.invoke(jmsServerControl, getParams(params, classes));
}
catch (NoSuchMethodException e)
{
+ HornetQServerControl hornetQServerControl = getHornetQServerControl();
m = hornetQServerControl.getClass().getMethod(method, classes);
return m.invoke(hornetQServerControl, getParams(params, classes));
}
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -22,9 +22,12 @@
package org.jboss.as.integration.hornetq.management.jms;
import org.hornetq.api.core.management.AddressSettingsInfo;
+import org.hornetq.api.core.management.HornetQServerControl;
import org.hornetq.api.core.management.RoleInfo;
import org.hornetq.api.jms.management.JMSQueueControl;
+import org.hornetq.api.jms.management.JMSServerControl;
import org.hornetq.core.server.HornetQServer;
+import org.hornetq.core.server.management.ManagementService;
import org.hornetq.jms.server.config.JMSQueueConfiguration;
import org.hornetq.jms.server.config.impl.JMSQueueConfigurationImpl;
import org.jboss.managed.api.annotation.*;
@@ -56,6 +59,7 @@
@ManagementParameter(name = "expiryAddress", description = "Expiry Address"),
@ManagementParameter(name = "maxSizeBytes", description = "Max Size of Address"),
@ManagementParameter(name = "pageSizeBytes", description = "Page Size"),
+ @ManagementParameter(name = "pageMaxCacheSize", description = "Max number of pages in the soft memory cache"),
@ManagementParameter(name = "deliveryAttempts", description = "Max Delivery Attempts"),
@ManagementParameter(name = "redeliveryDelay", description = "Redelivery Delay"),
@ManagementParameter(name = "lastValueQueue", description = "Last Value Queue"),
@@ -71,6 +75,7 @@
String expiryAddress,
long maxSizeBytes,
int pageSizeBytes,
+ int pageMaxCacheSize,
int deliveryAttempts,
long redeliveryDelay,
boolean lastValueQueue,
@@ -82,18 +87,21 @@
{
//update the address settings
+ HornetQServerControl hornetQServerControl = getHornetQServerControl();
hornetQServerControl.addAddressSettings("jms.queue." + name,
- DLA,
- expiryAddress,
- lastValueQueue,
- deliveryAttempts,
- maxSizeBytes,
- pageSizeBytes,
- redeliveryDelay,
- redistributionDelay,
- sendToDLAOnNoRoute,
- addressFullMessagePolicy);
+ DLA,
+ expiryAddress,
+ lastValueQueue,
+ deliveryAttempts,
+ maxSizeBytes,
+ pageSizeBytes,
+ pageMaxCacheSize,
+ redeliveryDelay,
+ redistributionDelay,
+ sendToDLAOnNoRoute,
+ addressFullMessagePolicy);
//create the queue
+ JMSServerControl jmsServerControl = getJmsServerControl();
jmsServerControl.createQueue(name, jndiName);
//update security
hornetQServerControl.addSecuritySettings("jms.queue." + name, sendRoles, consumeRoles, "", "", "", "", "");
@@ -103,7 +111,9 @@
params = {@ManagementParameter(name = "name", description = "the queue name")})
public void deleteQueue(String name) throws Exception
{
+ JMSServerControl jmsServerControl = getJmsServerControl();
jmsServerControl.destroyQueue(name.replace("jms.queue.", ""));
+ HornetQServerControl hornetQServerControl = getHornetQServerControl();
hornetQServerControl.removeSecuritySettings(name);
hornetQServerControl.removeAddressSettings(name);
}
@@ -114,9 +124,11 @@
public Object[] getQueueConfiguration(String name) throws Exception
{
Object[] config = new Object[3];
+ ManagementService managementService = getManagementService();
JMSQueueControl control = (JMSQueueControl) managementService.getResource(name);
JMSQueueConfiguration queueConfiguration = new JMSQueueConfigurationImpl(control.getName(), control.getSelector(), !control.isTemporary(), control.getJNDIBindings());
config[0] = queueConfiguration;
+ HornetQServerControl hornetQServerControl = getHornetQServerControl();
String addressSettingsAsJSON = hornetQServerControl.getAddressSettingsAsJSON(name);
config[1] = AddressSettingsInfo.from(addressSettingsAsJSON);
String rolesAsJSON = hornetQServerControl.getRolesAsJSON(name);
@@ -133,6 +145,7 @@
@ManagementParameter(name = "expiryAddress", description = "Expiry Address"),
@ManagementParameter(name = "maxSizeBytes", description = "Max Size of Address"),
@ManagementParameter(name = "pageSizeBytes", description = "Page Size"),
+ @ManagementParameter(name = "pageMaxCacheSize", description = "Max number of pages in the soft memory cache"),
@ManagementParameter(name = "deliveryAttempts", description = "Max Delivery Attempts"),
@ManagementParameter(name = "redeliveryDelay", description = "Redelivery Delay"),
@ManagementParameter(name = "lastValueQueue", description = "Last Value Queue"),
@@ -148,6 +161,7 @@
String expiryAddress,
long maxSizeBytes,
int pageSizeBytes,
+ int pageMaxCacheSize,
int deliveryAttempts,
long redeliveryDelay,
boolean lastValueQueue,
@@ -158,17 +172,19 @@
String consumeRoles) throws Exception
{
//update the address settings
+ HornetQServerControl hornetQServerControl = getHornetQServerControl();
hornetQServerControl.addAddressSettings(name,
- dla,
- expiryAddress,
- lastValueQueue,
- deliveryAttempts,
- maxSizeBytes,
- pageSizeBytes,
- redeliveryDelay,
- redistributionDelay,
- sendToDLAOnNoRoute,
- addressFullMessagePolicy);
+ dla,
+ expiryAddress,
+ lastValueQueue,
+ deliveryAttempts,
+ maxSizeBytes,
+ pageSizeBytes,
+ pageMaxCacheSize,
+ redeliveryDelay,
+ redistributionDelay,
+ sendToDLAOnNoRoute,
+ addressFullMessagePolicy);
//update security
hornetQServerControl.addSecuritySettings(name, sendRoles, consumeRoles, "", "", "", "", "");
}
@@ -179,6 +195,7 @@
@ManagementParameter(name = "names", description = "the measurement names")})
public String[] getQueueMeasurements(String name, String[] names) throws Exception
{
+ ManagementService managementService = getManagementService();
JMSQueueControl control = (JMSQueueControl) managementService.getResource(name);
String[] val = new String[names.length];
for (int i = 0, valLength = val.length; i < valLength; i++)
@@ -203,6 +220,7 @@
@ManagementParameter(name = "params", description = "the method params")})
public Object invokeQueueOperation(String name, String method, String[] params, String[] type) throws Exception
{
+ ManagementService managementService = getManagementService();
JMSQueueControl control = (JMSQueueControl) managementService.getResource(name);
Class[] classes = getClassTypes(type);
Method m = control.getClass().getMethod(method, classes);
@@ -217,6 +235,7 @@
@MetaMapping(value = MessageListMapper.class)
public List invokeQueueOperationMessageType(String name, String method, String[] params, String[] type) throws Exception
{
+ ManagementService managementService = getManagementService();
JMSQueueControl control = (JMSQueueControl) managementService.getResource(name);
Class[] classes = getClassTypes(type);
Method m = control.getClass().getMethod(method, classes);
@@ -229,7 +248,15 @@
@ManagementOperation(name = "getJMSQueues", description = "returns the JMS Queues")
public String[] getJMSQueues()
{
- return jmsServerControl.getQueueNames();
+ JMSServerControl jmsServerControl = getJmsServerControl();
+ if(jmsServerControl == null)
+ {
+ return new String[]{};
+ }
+ else
+ {
+ return jmsServerControl.getQueueNames();
+ }
}
@ManagementOperation(name = "isPaused", description = "is the queue paused?",
@@ -238,7 +265,8 @@
})
public boolean isPaused(String name) throws Exception
{
- JMSQueueControl control = (JMSQueueControl) managementService.getResource(name);
+ ManagementService managementService = getManagementService();
+ JMSQueueControl control = (JMSQueueControl) managementService.getResource(name);
return control.isPaused();
}
}
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -22,10 +22,12 @@
package org.jboss.as.integration.hornetq.management.jms;
import org.hornetq.api.core.management.AddressSettingsInfo;
+import org.hornetq.api.core.management.HornetQServerControl;
import org.hornetq.api.core.management.RoleInfo;
+import org.hornetq.api.jms.management.JMSServerControl;
import org.hornetq.api.jms.management.TopicControl;
-import org.hornetq.core.security.Role;
import org.hornetq.core.server.HornetQServer;
+import org.hornetq.core.server.management.ManagementService;
import org.hornetq.jms.server.config.TopicConfiguration;
import org.hornetq.jms.server.config.impl.TopicConfigurationImpl;
import org.jboss.managed.api.annotation.*;
@@ -53,7 +55,9 @@
params = {@ManagementParameter(name = "name", description = "the queue name")})
public void deleteTopic(String name) throws Exception
{
+ JMSServerControl jmsServerControl = getJmsServerControl();
jmsServerControl.destroyTopic(name.replace("jms.topic.", ""));
+ HornetQServerControl hornetQServerControl = getHornetQServerControl();
hornetQServerControl.removeSecuritySettings(name);
hornetQServerControl.removeAddressSettings(name);
}
@@ -64,9 +68,11 @@
public Object[] getTopicConfiguration(String name) throws Exception
{
Object[] config = new Object[3];
+ ManagementService managementService = getManagementService();
TopicControl control = (TopicControl) managementService.getResource(name);
TopicConfiguration topicConfiguration = new TopicConfigurationImpl(control.getName(), control.getJNDIBindings());
config[0] = topicConfiguration;
+ HornetQServerControl hornetQServerControl = getHornetQServerControl();
String jsonString = hornetQServerControl.getAddressSettingsAsJSON(name);
config[1] = AddressSettingsInfo.from(jsonString);
String rolesAsJSON = hornetQServerControl.getRolesAsJSON(name);
@@ -82,6 +88,7 @@
@ManagementParameter(name = "expiryAddress", description = "Expiry Address"),
@ManagementParameter(name = "maxSizeBytes", description = "Max Size of Address"),
@ManagementParameter(name = "pageSizeBytes", description = "Page Size"),
+ @ManagementParameter(name = "pageMaxCacheSize", description = "Max number of pages in the soft memory cache"),
@ManagementParameter(name = "deliveryAttempts", description = "Max Delivery Attempts"),
@ManagementParameter(name = "redeliveryDelay", description = "Redelivery Delay"),
@ManagementParameter(name = "lastValueQueue", description = "Last Value Queue"),
@@ -101,6 +108,7 @@
String expiryAddress,
long maxSizeBytes,
int pageSizeBytes,
+ int pageMaxCacheSize,
int deliveryAttempts,
long redeliveryDelay,
boolean lastValueQueue,
@@ -116,18 +124,21 @@
{
//update the address settings
+ HornetQServerControl hornetQServerControl = getHornetQServerControl();
hornetQServerControl.addAddressSettings("jms.queue." + name,
- DLA,
- expiryAddress,
- lastValueQueue,
- deliveryAttempts,
- maxSizeBytes,
- pageSizeBytes,
- redeliveryDelay,
- redistributionDelay,
- sendToDLAOnNoRoute,
- addressFullMessagePolicy);
+ DLA,
+ expiryAddress,
+ lastValueQueue,
+ deliveryAttempts,
+ maxSizeBytes,
+ pageSizeBytes,
+ pageMaxCacheSize,
+ redeliveryDelay,
+ redistributionDelay,
+ sendToDLAOnNoRoute,
+ addressFullMessagePolicy);
//create the queue
+ JMSServerControl jmsServerControl = getJmsServerControl();
jmsServerControl.createTopic(name, jndiName);
//update security
hornetQServerControl.addSecuritySettings(name, sendRoles, consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, createTempQueueRoles, deleteTempQueueRoles, "");
@@ -141,6 +152,7 @@
@ManagementParameter(name = "expiryAddress", description = "Expiry Address"),
@ManagementParameter(name = "maxSizeBytes", description = "Max Size of Address"),
@ManagementParameter(name = "pageSizeBytes", description = "Page Size"),
+ @ManagementParameter(name = "pageMaxCacheSize", description = "Max number of pages in the soft memory cache"),
@ManagementParameter(name = "deliveryAttempts", description = "Max Delivery Attempts"),
@ManagementParameter(name = "redeliveryDelay", description = "Redelivery Delay"),
@ManagementParameter(name = "lastValueQueue", description = "Last Value Queue"),
@@ -160,6 +172,7 @@
String expiryAddress,
long maxSizeBytes,
int pageSizeBytes,
+ int pageMaxCacheSize,
int deliveryAttempts,
long redeliveryDelay,
boolean lastValueQueue,
@@ -174,17 +187,19 @@
final String deleteTempQueueRoles) throws Exception
{
//update the address settings
+ HornetQServerControl hornetQServerControl = getHornetQServerControl();
hornetQServerControl.addAddressSettings(name,
- dla,
- expiryAddress,
- lastValueQueue,
- deliveryAttempts,
- maxSizeBytes,
- pageSizeBytes,
- redeliveryDelay,
- redistributionDelay,
- sendToDLAOnNoRoute,
- addressFullMessagePolicy);
+ dla,
+ expiryAddress,
+ lastValueQueue,
+ deliveryAttempts,
+ maxSizeBytes,
+ pageSizeBytes,
+ pageMaxCacheSize,
+ redeliveryDelay,
+ redistributionDelay,
+ sendToDLAOnNoRoute,
+ addressFullMessagePolicy);
//update security
hornetQServerControl.addSecuritySettings(name, sendRoles, consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, createTempQueueRoles, deleteTempQueueRoles, "");
}
@@ -195,7 +210,7 @@
@ManagementParameter(name = "names", description = "the measurement names")})
public String[] getTopicMeasurements(String name, String[] names) throws Exception
{
- TopicControl control = (TopicControl) managementService.getResource(name);
+ TopicControl control = (TopicControl) getManagementService().getResource(name);
String[] val = new String[names.length];
for (int i = 0, valLength = val.length; i < valLength; i++)
{
@@ -219,7 +234,7 @@
@ManagementParameter(name = "params", description = "the method params")})
public Object invokeTopicOperation(String name, String method, String[] params, String[] type) throws Exception
{
- TopicControl control = (TopicControl) managementService.getResource(name);
+ TopicControl control = (TopicControl) getManagementService().getResource(name);
Class[] classes = getClassTypes(type);
Method m = control.getClass().getMethod(method, classes);
return m.invoke(control, getParams(params, classes));
@@ -233,6 +248,7 @@
@MetaMapping(value = MessageListMapper.class)
public List invokeTopicOperationMessageType(String name, String method, String[] params, String[] type) throws Exception
{
+ ManagementService managementService = getManagementService();
TopicControl control = (TopicControl) managementService.getResource(name);
Class[] classes = getClassTypes(type);
Method m = control.getClass().getMethod(method, classes);
@@ -251,6 +267,7 @@
@MetaMapping(value = SubscriptionInfoMapper.class)
public Object[] invokeTopicOperationSubscriptionType(String name, String method, String[] params, String[] type) throws Exception
{
+ ManagementService managementService = getManagementService();
TopicControl control = (TopicControl) managementService.getResource(name);
Class[] classes = getClassTypes(type);
Method m = control.getClass().getMethod(method, classes);
@@ -262,6 +279,14 @@
@ManagementOperation(name = "getJMSTopics", description = "returns the JMS Topics")
public String[] getJMSTopics()
{
- return jmsServerControl.getTopicNames();
+ JMSServerControl jmsServerControl = getJmsServerControl();
+ if(jmsServerControl == null)
+ {
+ return new String[]{};
+ }
+ else
+ {
+ return jmsServerControl.getTopicNames();
+ }
}
}
Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSConfiguration.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSConfiguration.java 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/template/JAXBJMSConfiguration.java 2011-03-08 19:01:24 UTC (rev 110853)
@@ -89,4 +89,10 @@
{
this.topics = topics;
}
+
+ at Override
+public String getDomain() {
+ // TODO Auto-generated method stub
+ return null;
}
+}
Added: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/hornetq-configuration.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/hornetq-configuration.xml (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/hornetq-configuration.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -0,0 +1,116 @@
+<!--
+ ~ 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">
+
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+ <clustered>true</clustered>
+
+ <shared-store>true</shared-store>
+
+ <log-delegate-factory-class-name>org.hornetq.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>
+
+ <bindings-directory>../${hornetq.data.dir:hornetq}/bindings</bindings-directory>
+
+ <journal-directory>../${hornetq.data.dir:hornetq}/journal</journal-directory>
+
+ <journal-min-files>10</journal-min-files>
+
+ <large-messages-directory>../${hornetq.data.dir:hornetq}/largemessages</large-messages-directory>
+
+ <paging-directory>../${hornetq.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="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="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>netty</connector-ref>
+ </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>
+ <connector-ref>netty</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ <!--max hops defines how messages are redistributed, the default is 1 meaning only distribute to directly
+ connected nodes, to disable set to 0-->
+ <!--<max-hops>0</max-hops>-->
+ </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: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/hornetq-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/hornetq-jboss-beans.xml (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/hornetq-jboss-beans.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -0,0 +1,62 @@
+<?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>
+ <property name="allowClientLogin">false</property>
+ <property name="authoriseOnClientLogin">false</property>
+ </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>
+
+ <!-- POJO which ensures HornetQ Resource Adapter is stopped before HornetQServer -->
+ <bean name="HornetQRAService" class="org.hornetq.ra.HornetQRAService">
+ <constructor>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>jboss.jca:name='jms-ra.rar',service=RARDeployment</parameter>
+ </constructor>
+ <depends>HornetQServer</depends>
+ </bean>
+
+</deployment>
Added: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/hornetq-jms.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/hornetq-jms.xml (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/hornetq-jms.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -0,0 +1,48 @@
+<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">
+ <xa>true</xa>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
+ <entries>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ </entries>
+
+ <ha>true</ha>
+ <!-- Pause 1 second between connect attempts -->
+ <retry-interval>1000</retry-interval>
+
+ <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to
+ implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect
+ pause is the same length -->
+ <retry-interval-multiplier>1.0</retry-interval-multiplier>
+
+ <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") -->
+ <reconnect-attempts>-1</reconnect-attempts>
+ </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>
+
+ <queue name="DLQ">
+ <entry name="/queue/DLQ"/>
+ </queue>
+
+ <queue name="ExpiryQueue">
+ <entry name="/queue/ExpiryQueue"/>
+ </queue>
+
+</configuration>
+
Added: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/jms-ds.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/jms-ds.xml (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq/jms-ds.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -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: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq-backup1/hornetq-configuration.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq-backup1/hornetq-configuration.xml (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq-backup1/hornetq-configuration.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -0,0 +1,110 @@
+<!--
+ ~ 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>
+
+ <backup>true</backup>
+
+ <shared-store>true</shared-store>
+
+ <allow-failback>false</allow-failback>
+
+ <log-delegate-factory-class-name>org.hornetq.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>
+
+ <bindings-directory>../${hornetq.backup1.data.dir:hornetq-backup1}/bindings</bindings-directory>
+
+ <journal-directory>../${hornetq.backup1.data.dir:hornetq-backup1}/journal</journal-directory>
+
+ <journal-min-files>10</journal-min-files>
+
+ <large-messages-directory>../${hornetq.backup1.data.dir:hornetq-backup1}/largemessages</large-messages-directory>
+
+ <paging-directory>../${hornetq.backup1.data.dir:hornetq-backup1}/paging</paging-directory>
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="host" value="${jboss.bind.address:localhost}"/>
+ <param key="port" value="${hornetq.backup1.remoting.netty.port:5446}"/>
+ </connector>
+
+ <!--invm connector added by the live server on this node, used by the bridges-->
+ <connector name="in-vm">
+ <factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ <param key="server-id" value="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.backup1.remoting.netty.port:5446}"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </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>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ <!--max hops defines how messages are redistributed, the default is 1 meaning only distribute to directly
+ connected nodes, to disable set to 0-->
+ <!--<max-hops>0</max-hops>-->
+ </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: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq-backup1/hornetq-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq-backup1/hornetq-jboss-beans.xml (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/cluster-with-dedicated-backup/hornetq-backup1/hornetq-jboss-beans.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -0,0 +1,65 @@
+<?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-backup1/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>
+ <property name="allowClientLogin">false</property>
+ <property name="authoriseOnClientLogin">false</property>
+ </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>
+
+
+ <!-- POJO which ensures HornetQ Resource Adapter is stopped before HornetQServer -->
+ <bean name="HornetQRAService" class="org.hornetq.ra.HornetQRAService">
+ <constructor>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>jboss.jca:name='jms-ra.rar',service=RARDeployment</parameter>
+ </constructor>
+ <depends>HornetQServer</depends>
+ </bean>
+
+
+</deployment>
Added: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/README.txt
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/README.txt (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/README.txt 2011-03-08 19:01:24 UTC (rev 110853)
@@ -0,0 +1,28 @@
+This example shows how to run 2 instances of eap each with a live and backup hornetq server.
+
+Firstly make a copy of the all configuration, lets call this hq1.
+
+Now over write the config files in hq1/deploy/hornetq with the ones in the examples hornetq directory.
+
+Now copy the hornetq-backup1 directory into the hq1/deply direcoty.
+
+we now have a server configured with live and backup.
+
+Now make a second configuration by copying hq1, lets call this hq2.
+
+Now start the first server by running
+
+./run.sh -c hq1
+
+and now start the second server by running
+
+./run.sh -Djboss.service.binding.set="ports-01" -Dhornetq.data.dir=hornetq-backup1 -Dhornetq.backup1.data.dir=hornetq -c hq2
+
+here you can see we have switched which journals the live and the backup point to.
+
+NB these by default are in the root of the eap directory, you can change this in the hornetq-configuration.xml files if needed.
+
+You now have a symmetrical cluster with backups.
+
+To chain more live backups, simply change what journal each libe backup uses or to add multiple backups simply copy the
+hornetq-backup1 directory and configure accordingly
\ No newline at end of file
Added: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/hornetq-configuration.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/hornetq-configuration.xml (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/hornetq-configuration.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -0,0 +1,116 @@
+<!--
+ ~ 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">
+
+ <!-- Don't change this name.
+ This is used by the dependency framework on the deployers,
+ to make sure this deployment is done before any other deployment -->
+ <name>HornetQ.main.config</name>
+
+ <clustered>true</clustered>
+
+ <shared-store>true</shared-store>
+
+ <log-delegate-factory-class-name>org.hornetq.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>
+
+ <bindings-directory>../${hornetq.data.dir:hornetq}/bindings</bindings-directory>
+
+ <journal-directory>../${hornetq.data.dir:hornetq}/journal</journal-directory>
+
+ <journal-min-files>10</journal-min-files>
+
+ <large-messages-directory>../${hornetq.data.dir:hornetq}/largemessages</large-messages-directory>
+
+ <paging-directory>../${hornetq.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="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="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>netty</connector-ref>
+ </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>
+ <connector-ref>netty</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ <!--max hops defines how messages are redistributed, the default is 1 meaning only distribute to directly
+ connected nodes, to disable set to 0-->
+ <!--<max-hops>0</max-hops>-->
+ </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: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/hornetq-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/hornetq-jboss-beans.xml (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/hornetq-jboss-beans.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -0,0 +1,62 @@
+<?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>
+ <property name="allowClientLogin">false</property>
+ <property name="authoriseOnClientLogin">false</property>
+ </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>
+
+ <!-- POJO which ensures HornetQ Resource Adapter is stopped before HornetQServer -->
+ <bean name="HornetQRAService" class="org.hornetq.ra.HornetQRAService">
+ <constructor>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>jboss.jca:name='jms-ra.rar',service=RARDeployment</parameter>
+ </constructor>
+ <depends>HornetQServer</depends>
+ </bean>
+
+</deployment>
Added: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/hornetq-jms.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/hornetq-jms.xml (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/hornetq-jms.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -0,0 +1,48 @@
+<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">
+ <xa>true</xa>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
+ <entries>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ </entries>
+
+ <ha>true</ha>
+ <!-- Pause 1 second between connect attempts -->
+ <retry-interval>1000</retry-interval>
+
+ <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to
+ implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect
+ pause is the same length -->
+ <retry-interval-multiplier>1.0</retry-interval-multiplier>
+
+ <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") -->
+ <reconnect-attempts>-1</reconnect-attempts>
+ </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>
+
+ <queue name="DLQ">
+ <entry name="/queue/DLQ"/>
+ </queue>
+
+ <queue name="ExpiryQueue">
+ <entry name="/queue/ExpiryQueue"/>
+ </queue>
+
+</configuration>
+
Added: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/jms-ds.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/jms-ds.xml (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq/jms-ds.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -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: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq-backup1/hornetq-configuration.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq-backup1/hornetq-configuration.xml (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq-backup1/hornetq-configuration.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -0,0 +1,109 @@
+<!--
+ ~ 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">
+
+ <jmx-domain>org.hornetq.backup1</jmx-domain>
+
+ <clustered>true</clustered>
+
+ <backup>true</backup>
+
+ <shared-store>true</shared-store>
+
+ <allow-failback>true</allow-failback>
+
+ <log-delegate-factory-class-name>org.hornetq.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>
+
+ <bindings-directory>../${hornetq.backup1.data.dir:hornetq-backup1}/bindings</bindings-directory>
+
+ <journal-directory>../${hornetq.backup1.data.dir:hornetq-backup1}/journal</journal-directory>
+
+ <journal-min-files>10</journal-min-files>
+
+ <large-messages-directory>../${hornetq.backup1.data.dir:hornetq-backup1}/largemessages</large-messages-directory>
+
+ <paging-directory>../${hornetq.backup1.data.dir:hornetq-backup1}/paging</paging-directory>
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="host" value="${jboss.bind.address:localhost}"/>
+ <param key="port" value="${hornetq.backup1.remoting.netty.port:5446}"/>
+ </connector>
+
+ <!--invm connector added by the live server on this node, used by the bridges-->
+ <connector name="in-vm">
+ <factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ <param key="server-id" value="${hornetq.backup1.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.backup1.remoting.netty.port:5446}"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </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>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <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: branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq-backup1/hornetq-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq-backup1/hornetq-jboss-beans.xml (rev 0)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/examples/symmetric-cluster-with-backups-colocated/hornetq-backup1/hornetq-jboss-beans.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The core configuration -->
+ <bean name="BackupConfiguration" class="org.hornetq.core.config.impl.FileConfiguration">
+ <property name="configurationUrl">${jboss.server.home.url}/deploy/hornetq-backup1/hornetq-configuration.xml</property>
+ </bean>
+
+
+ <!-- The core server -->
+ <bean name="BackupHornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="BackupConfiguration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="HornetQSecurityManager"/>
+ </parameter>
+ </constructor>
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="BackupJMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="BackupHornetQServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+
+</deployment>
Modified: branches/JBPAPP_5_1/hornetq-int/src/resources/jbossts-properties.xml
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/resources/jbossts-properties.xml 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/hornetq-int/src/resources/jbossts-properties.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -241,6 +241,12 @@
-->
<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/>
+ <!--
+ <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ2"
+ value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445"/>-->
+
+
+ <property name="com.arjuna.ats.jta.xaRecoveryNode" value="1"/>
</properties>
<properties depends="arjuna,txoj,jta" name="recoverymanager">
<!--
Modified: branches/JBPAPP_5_1/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml 2011-03-08 19:00:15 UTC (rev 110852)
+++ branches/JBPAPP_5_1/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml 2011-03-08 19:01:24 UTC (rev 110853)
@@ -323,6 +323,52 @@
<property name="description">SSL socket for JBoss Messaging 2.x</property>
</bean>
+ <!-- ********************* HornetQ **************** -->
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">HornetQ</property>
+ <property name="bindingName">netty-port</property>
+ <property name="port">5445</property>
+ <property name="description">Socket for HornetQ</property>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">HornetQ</property>
+ <property name="bindingName">netty-ssl-port</property>
+ <property name="port">5446</property>
+ <property name="description">SSL socket for HornetQ</property>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">HornetQ</property>
+ <property name="bindingName">netty-batch-port</property>
+ <property name="port">5455</property>
+ <property name="description">Socket for HornetQ</property>
+ </bean>
+
+ <!-- ********************* HornetQ Backup Server 1 **************** -->
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">HornetQ</property>
+ <property name="bindingName">netty-backup1-port</property>
+ <property name="port">5465</property>
+ <property name="description">Socket for HornetQ</property>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">HornetQ</property>
+ <property name="bindingName">netty-backup1-ssl-port</property>
+ <property name="port">5466</property>
+ <property name="description">SSL socket for HornetQ</property>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">HornetQ</property>
+ <property name="bindingName">netty-backup1-batch-port</property>
+ <property name="port">5475</property>
+ <property name="description">Socket for HornetQ</property>
+ </bean>
+
<!-- ********************* deploy/transaction-jboss-beans.xml ********************** -->
<!-- JBossTS Recovery Manager -->
@@ -592,31 +638,83 @@
</parameter>
</constructor>
</bean>
- <!-- JBM2 netty connector -->
+
+ <!--HornetQ connectors -->
+ <!-- HornetQ netty connector -->
<bean class="org.jboss.services.binding.SystemPropertyBinding">
<constructor>
- <parameter>jbm.remoting.netty.port</parameter>
+ <parameter>hornetq.remoting.netty.port</parameter>
<parameter class="int">
<value-factory bean="ServiceBindingManager" method="getIntBinding">
- <parameter>JBM2</parameter>
+ <parameter>HornetQ</parameter>
<parameter>netty-port</parameter>
</value-factory>
</parameter>
</constructor>
</bean>
- <!-- JBM2 netty ssl connector -->
+ <!-- HornetQ netty ssl connector -->
<bean class="org.jboss.services.binding.SystemPropertyBinding">
<constructor>
- <parameter>jbm.remoting.netty.ssl.port</parameter>
+ <parameter>hornetq.remoting.netty.ssl.port</parameter>
<parameter class="int">
<value-factory bean="ServiceBindingManager" method="getIntBinding">
- <parameter>JBM2</parameter>
+ <parameter>HornetQ</parameter>
<parameter>netty-ssl-port</parameter>
</value-factory>
</parameter>
</constructor>
</bean>
-
+ <!-- HornetQ netty batch connector -->
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>hornetq.remoting.netty.batch.port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>HornetQ</parameter>
+ <parameter>netty-batch-port</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!--HornetQ Backup 1 connectors -->
+ <!-- HornetQ netty connector -->
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>hornetq.backup1.remoting.netty.port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>HornetQ</parameter>
+ <parameter>netty-backup1-port</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <!-- HornetQ netty ssl connector -->
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>hornetq.backup1.remoting.netty.ssl.port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>HornetQ</parameter>
+ <parameter>netty-backup1-ssl-port</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <!-- HornetQ netty batch connector -->
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>hornetq.backup1.remoting.netty.port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>HornetQ</parameter>
+ <parameter>netty-backup1-batch-port</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+
<!-- JGroups -->
<bean class="org.jboss.services.binding.SystemPropertyBinding">
<constructor>
More information about the jboss-cvs-commits
mailing list