[jboss-cvs] JBossAS SVN: r109970 - in branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers: pojo and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 16 09:47:59 EST 2010
Author: ataylor
Date: 2010-12-16 09:47:59 -0500 (Thu, 16 Dec 2010)
New Revision: 109970
Modified:
branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DeploymentFactory.java
branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java
branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQJMSDeployment.java
branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java
branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java
Log:
changes for hornetq integration
Modified: branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DeploymentFactory.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DeploymentFactory.java 2010-12-16 14:30:54 UTC (rev 109969)
+++ branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/DeploymentFactory.java 2010-12-16 14:47:59 UTC (rev 109970)
@@ -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);
Modified: branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java 2010-12-16 14:30:54 UTC (rev 109969)
+++ branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQConnectionFactoryDeployment.java 2010-12-16 14:47:59 UTC (rev 109970)
@@ -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_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQJMSDeployment.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQJMSDeployment.java 2010-12-16 14:30:54 UTC (rev 109969)
+++ branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQJMSDeployment.java 2010-12-16 14:47:59 UTC (rev 109970)
@@ -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_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java 2010-12-16 14:30:54 UTC (rev 109969)
+++ branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQQueueDeployment.java 2010-12-16 14:47:59 UTC (rev 109970)
@@ -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_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java 2010-12-16 14:30:54 UTC (rev 109969)
+++ branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQTopicDeployment.java 2010-12-16 14:47:59 UTC (rev 109970)
@@ -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)
{
More information about the jboss-cvs-commits
mailing list