[jboss-cvs] JBossAS SVN: r101944 - in branches/Branch_Hornet_Temporary_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
Fri Mar 5 06:32:39 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-03-05 06:32:38 -0500 (Fri, 05 Mar 2010)
New Revision: 101944
Modified:
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigParserDeployer.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSParserDeployer.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSRealDeployer.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java
Log:
deployment tweaks
Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigParserDeployer.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigParserDeployer.java 2010-03-05 11:24:13 UTC (rev 101943)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQConfigParserDeployer.java 2010-03-05 11:32:38 UTC (rev 101944)
@@ -34,6 +34,8 @@
this.parser = new FileConfigurationParser();
this.setSuffix(name);
+
+ setRelativeOrder(50);
}
@Override
Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java 2010-03-05 11:24:13 UTC (rev 101943)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQCoreConfigRealDeployer.java 2010-03-05 11:32:38 UTC (rev 101944)
@@ -1,5 +1,6 @@
package org.jboss.as.integration.hornetq.deployers;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.hornetq.core.config.Configuration;
@@ -32,19 +33,21 @@
{
super(Configuration.class);
addOutput(BeanMetaData.class);
+ setRelativeOrder(50);
}
@Override
public void deploy(VFSDeploymentUnit unit, Configuration config) throws DeploymentException
{
+ log.info("ConfigRealDeployer");
String name = "HornetQCoreDeployment::" + idGenerator.incrementAndGet();
-
+
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, HornetQCoreDeployment.class.getName());
builder.addPropertyMetaData("name", name);
builder.addPropertyMetaData("server", builder.createInject("HornetQServer"));
-
+
builder.addPropertyMetaData("config", config);
BeanMetaData bean = builder.getBeanMetaData();
Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSParserDeployer.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSParserDeployer.java 2010-03-05 11:24:13 UTC (rev 101943)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSParserDeployer.java 2010-03-05 11:32:38 UTC (rev 101944)
@@ -51,6 +51,8 @@
// We build managed objects
setBuildManagedObject(true);
+
+ setRelativeOrder(100);
}
public ManagedObjectCreator getMgtObjectCreator()
Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSRealDeployer.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSRealDeployer.java 2010-03-05 11:24:13 UTC (rev 101943)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/HornetQJMSRealDeployer.java 2010-03-05 11:32:38 UTC (rev 101944)
@@ -1,14 +1,18 @@
package org.jboss.as.integration.hornetq.deployers;
+import java.util.Map;
+
import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
import org.hornetq.jms.server.config.JMSConfiguration;
import org.hornetq.jms.server.config.JMSQueueConfiguration;
import org.hornetq.jms.server.config.TopicConfiguration;
import org.jboss.as.integration.hornetq.deployers.pojo.HornetQConnectionFactoryDeployment;
+import org.jboss.as.integration.hornetq.deployers.pojo.HornetQCoreDeployment;
import org.jboss.as.integration.hornetq.deployers.pojo.HornetQQueueDeployment;
import org.jboss.as.integration.hornetq.deployers.pojo.HornetQTopicDeployment;
import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.DependencyMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
@@ -35,39 +39,42 @@
{
super(JMSConfiguration.class);
addOutput(BeanMetaData.class);
+ setRelativeOrder(100);
}
@Override
public void deploy(VFSDeploymentUnit unit, JMSConfiguration mainConfig) throws DeploymentException
{
+ log.info("JMSRealDeployer");
+
for (JMSQueueConfiguration config : mainConfig.getQueueConfigurations())
{
String name = "org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=Queue";
- unit.addAttachment(name, createBasicBean(HornetQQueueDeployment.class.getName(), name, config));
+ unit.addAttachment(name, createBasicBean(unit, HornetQQueueDeployment.class.getName(), name, config));
}
for (TopicConfiguration config : mainConfig.getTopicConfigurations())
{
String name = "org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=Topic";
- unit.addAttachment(name, createBasicBean(HornetQTopicDeployment.class.getName(), name, config));
+ unit.addAttachment(name, createBasicBean(unit, HornetQTopicDeployment.class.getName(), name, config));
}
for (ConnectionFactoryConfiguration config : mainConfig.getConnectionFactoryConfigurations())
{
String name = "org.hornetq:module=JMS,name=\"" + config.getName() + "\",type=ConnectionFactory";
- unit.addAttachment(name, createBasicBean(HornetQConnectionFactoryDeployment.class.getName(), name, config));
+ unit.addAttachment(name, createBasicBean(unit, HornetQConnectionFactoryDeployment.class.getName(), name, config));
}
}
/**
* @param name
*/
- private BeanMetaData createBasicBean(String configClass, String name, Object config)
+ private BeanMetaData createBasicBean(VFSDeploymentUnit unit, String configClass, String name, Object config)
{
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, configClass);
@@ -76,11 +83,26 @@
builder.addPropertyMetaData("jmsServer", builder.createInject("JMSServerManager"));
builder.addPropertyMetaData("config", config);
-
+
// runtime control registry
builder.addPropertyMetaData("kernel", builder.createInject(KernelConstants.KERNEL_NAME));
+
builder.addPropertyMetaData("mbeanServer", builder.createInject("MBeanServer"));
+ for (Map.Entry<String, Object> entry : unit.getAttachments().entrySet())
+ {
+ if (entry.getValue() instanceof BeanMetaData)
+ {
+ BeanMetaData checkBuilder = (BeanMetaData)entry.getValue();
+ if (checkBuilder.getBean().equals(HornetQCoreDeployment.class.getName()))
+ {
+ // If there is any core deployment on the same deployment unit, it needs to be deployed first.
+ // So we add a dependency here
+ builder.addDependency(entry.getKey());
+ }
+ }
+ }
+
return builder.getBeanMetaData();
}
Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java 2010-03-05 11:24:13 UTC (rev 101943)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/deployers/pojo/HornetQCoreDeployment.java 2010-03-05 11:32:38 UTC (rev 101944)
@@ -65,7 +65,7 @@
@Start
public void start()
{
- log.info("Being started!");
+ log.info("Core Deployment!");
for (Map.Entry<String, AddressSettings> entry : config.getAddressesSettings().entrySet())
{
More information about the jboss-cvs-commits
mailing list